Changeset 21300d7 for src/AST

Timestamp:

Jun 12, 2019, 4:06:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

462a7c7, d60780c

Parents:

aaeacf4 (diff), 6625727 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/AST

Files:

• Convert.cpp (modified) (3 diffs)
• Node.hpp (modified) (1 diff)
• Print.hpp (modified) (2 diffs)
• porting.md (modified) (1 diff)

src/AST/Convert.cpp

@@ -2193 +2193 @@
 
         int isStringlikeConstantType(const Type *t) {
+                const Type *referentType = nullptr;
                 if ( const ArrayType * aty = dynamic_cast< const ArrayType * >( t ) ) {
-                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( aty->base ) ) {
+                        referentType = aty->base;
+                } else if ( const PointerType * pty = dynamic_cast< const PointerType * >( t ) ) {
+                        referentType = pty->base;
+                }
+                if (referentType) {
+                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( referentType ) ) {
                            if ( bty->kind == BasicType::Kind::Char ) {
                                    return true;
@@ -2205 +2211 @@
         virtual void visit( ConstantExpr * old ) override final {
                 ast::ConstantExpr *rslt = nullptr;
-                if (isIntlikeConstantType(old->result)) {
+                if (isStringlikeConstantType(old->result)) {
+                        rslt = new ast::ConstantExpr(
+                                old->location,
+                                GET_ACCEPT_1(result, Type),
+                                old->constant.get_value(),
+                                0,
+                                ast::ConstantExpr::Kind::String
+                        );
+                } else if (isIntlikeConstantType(old->result)) {
                         rslt = new ast::ConstantExpr(
                                 old->location,
@@ -2219 +2233 @@
                                 old->constant.get_value(),
                                 (double) old->constant.get_dval()
-                        );
-                } else if (isStringlikeConstantType(old->result)) {
-                        rslt = new ast::ConstantExpr(
-                                old->location,
-                                GET_ACCEPT_1(result, Type),
-                                old->constant.get_value(),
-                                0,
-                                ast::ConstantExpr::Kind::String
                         );
                 }

src/AST/Node.hpp

@@ -99 +99 @@
 
 /// Mutate a node field (only clones if not equal to existing value)
-template<typename node_t, typename field_t>
-const node_t * mutate_field( 
-        const node_t * node, 
-        typename std::remove_const<typename std::remove_reference<field_t>::type>::type node_t::* field,
-        field_t&& val 
-) {
+template<typename node_t, typename field_t, typename assn_t>
+const node_t * mutate_field( const node_t * node, field_t node_t::* field, assn_t && val ) {
+        // skip mutate if equivalent
         if ( node->*field == val ) return node;
         
+        // mutate and return
         node_t * ret = mutate( node );
-        ret->*field = std::forward< field_t >( val );
+        ret->*field = std::forward< assn_t >( val );
+        return ret;
+}
+
+/// Mutate a single index of a node field (only clones if not equal to existing value)
+template<typename node_t, typename coll_t, typename ind_t, typename field_t>
+const node_t * mutate_field_index(
+        const node_t * node, coll_t node_t::* field, ind_t i, field_t && val
+) {
+        // skip mutate if equivalent
+        if  ( (node->*field)[i] == val ) return node;
+
+        // mutate and return
+        node_t * ret = mutate( node );
+        (ret->*field)[i] = std::forward< field_t >( val );
         return ret;
 }

src/AST/Print.hpp

@@ -16 +16 @@
 #pragma once
 
-#include <iosfwd>
-#include <utility> // for forward
+#include <iostream>
+#include <utility>   // for forward
 
 #include "AST/Node.hpp"
@@ -32 +32 @@
 void printShort( std::ostream & os, const ast::Decl * node, Indenter indent = {} );
 
-inline void printShort( std::ostream & os, const ast::Decl * node, unsigned int indent ) {
-    printShort( os, node, Indenter{ indent } );
+/// Print a collection of items
+template< typename Coll >
+void printAll( std::ostream & os, const Coll & c, Indenter indent = {} ) {
+    for ( const auto & i : c ) {
+        if ( ! i ) continue;
+        
+        os << indent;
+        print( os, i, indent );
+        os << std::endl;
+    }
 }
 

src/AST/porting.md

@@ -299 +299 @@
 * `openVars` => `open`
 
+`ExplodedActual` => `ExplodedArg`
+* `ExplodedActual.h` => `ExplodedArg.hpp`
+
 [1] https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gcc/Type-Attributes.html#Type-Attributes