Changeset 1ccc599

Timestamp:

Feb 21, 2018, 12:57:41 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

eaa1759

Parents:

6c7c63c (diff), 599fbb6 (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.

git-author:

Peter A. Buhr <pabuhr@…> (02/21/18 12:56:00)

git-committer:

Peter A. Buhr <pabuhr@…> (02/21/18 12:57:41)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Files:

• doc/papers/general/Paper.tex (modified) (2 diffs)
• src/Common/PassVisitor.impl.h (modified) (3 diffs)
• src/SymTab/Indexer.cc (modified) (1 diff)
• src/SymTab/Indexer.h (modified) (1 diff)

doc/papers/general/Paper.tex

@@ -1916 +1916 @@
 Alternative call syntax (literal argument before routine name) to convert basic literals into user literals.
 
-{\lstset{language=CFA,deletedelim=**[is][]{`}{`},moredelim=**[is][\color{red}]{@}{@}}
+{\lstset{language=CFA,moredelim=**[is][\color{red}]{|}{|},deletedelim=**[is][]{`}{`}}
 \begin{cfa}
 struct Weight { double stones; };
@@ -1924 +1924 @@
 Weight ?+?( Weight l, Weight r ) { return (Weight){ l.stones + r.stones }; }
 
-Weight @?`st@( double w ) { return (Weight){ w }; } $\C{// backquote for units}$
-Weight @?`lb@( double w ) { return (Weight){ w / 14.0 }; }
-Weight @?`kg@( double w ) { return (Weight) { w * 0.1575}; }
+Weight |?`st|( double w ) { return (Weight){ w }; } $\C{// backquote for units}$
+Weight |?`lb|( double w ) { return (Weight){ w / 14.0 }; }
+Weight |?`kg|( double w ) { return (Weight) { w * 0.1575}; }
 
 int main() {
         Weight w, hw = { 14 };                                  $\C{// 14 stone}$
-        w = 11@`st@ + 1@`lb@;
-        w = 70.3@`kg@;
-        w = 155@`lb@;
-        w = 0x_9b_u@`lb@;                                               $\C{// hexadecimal unsigned weight (155)}$
-        w = 0_233@`lb@;                                                 $\C{// octal weight (155)}$
-        w = 5@`st@ + 8@`kg@ + 25@`lb@ + hw;
+        w = 11|`st| + 1|`lb|;
+        w = 70.3|`kg|;
+        w = 155|`lb|;
+        w = 0x_9b_u|`lb|;                                               $\C{// hexadecimal unsigned weight (155)}$
+        w = 0_233|`lb|;                                                 $\C{// octal weight (155)}$
+        w = 5|`st| + 8|`kg| + 25|`lb| + hw;
 }
 \end{cfa}

src/Common/PassVisitor.impl.h

@@ -1121 +1121 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ImplicitCtorDtorStmt * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+
+        maybeAccept_impl( node->callStmt, *this );
+
+        VISIT_END( node );
 }
 
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ImplicitCtorDtorStmt * node ) {
-        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->callStmt, *this );
+
+        MUTATE_END( Statement, node );
 }
 
@@ -2008 +2016 @@
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {
-        VISIT_BODY( node );
+        VISIT_START( node );
+
+        maybeAccept_impl( node->forall, *this );
+
+        VISIT_END( node );
+}
+
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( VoidType * node ) {
+        MUTATE_START( node );
+
+        maybeMutate_impl( node->forall, *this );
+
+        MUTATE_END( Type, node );
 }
 
@@ -2235 +2256 @@
 
 //---------------------------------------------------------------------------------------------------------------
-template< typename pass_type >
-Type * PassVisitor< pass_type >::mutate( VoidType * node ) {
-        MUTATE_BODY( Type, node );
-}
 
 template< typename pass_type >

src/SymTab/Indexer.cc

@@ -457 +457 @@
 
                 // add to indexer
-                tables->idTable[ name ][ mangleName ] = { decl, baseExpr, deleteStmt };
+                tables->idTable[ name ][ mangleName ] = IdData{ decl, baseExpr, deleteStmt };
                 ++tables->size;
         }

src/SymTab/Indexer.h

@@ -46 +46 @@
                         /// non-null if this declaration is deleted
                         BaseSyntaxNode * deleteStmt = nullptr;
+
+                        // NOTE: shouldn't need either of these constructors, but gcc-4 does not properly support initializer lists with default members.
+                        IdData() = default;
+                        IdData( DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ) {}
 
                         Expression * combine() const;