Changeset ff29f08 for src/SynTree

Timestamp:

May 18, 2018, 2:09:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/SynTree

Files:

• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (2 diffs)
• Statement.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Mutator.h

@@ -39 +39 @@
         virtual Statement * mutate( ExprStmt * exprStmt ) = 0;
         virtual Statement * mutate( AsmStmt * asmStmt ) = 0;
+        virtual Statement * mutate( DirectiveStmt * dirStmt ) = 0;
         virtual Statement * mutate( IfStmt * ifStmt ) = 0;
         virtual Statement * mutate( WhileStmt * whileStmt ) = 0;

src/SynTree/Statement.cc

@@ -81 +81 @@
 
 
+DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
+
+void DirectiveStmt::print( std::ostream &os, Indenter ) const {
+        os << "GCC Directive:" << directive << endl;
+}
+
+
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
@@ -370 +377 @@
 void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
-        os << indent << "... with block:" << endl << indent+1;
-        // block->print( os, indent + 4 );
+        indent += 1;
+        for( auto & clause : clauses ) {
+                os << indent << "target function :";
+                if(clause.target.function) { clause.target.function->print(os, indent + 1); }
+                os << endl << indent << "with arguments :" << endl;
+                for( auto & thing : clause.target.arguments) {
+                        if(thing) { thing->print(os, indent + 1); }
+                }
+                os << indent << " with statment :" << endl;
+                if(clause.statement) { clause.statement->print(os, indent + 1); }
+
+                os << indent << " with condition :" << endl;
+                if(clause.condition) { clause.condition->print(os, indent + 1); }
+        }
+
+        os << indent << " timeout of :" << endl;
+        if(timeout.time) { timeout.time->print(os, indent + 1); }
+
+        os << indent << " with statment :" << endl;
+        if(timeout.statement) { timeout.statement->print(os, indent + 1); }
+
+        os << indent << " with condition :" << endl;
+        if(timeout.condition) { timeout.condition->print(os, indent + 1); }
+
+
+        os << indent << " else :" << endl;
+        if(orelse.statement) { orelse.statement->print(os, indent + 1); }
+
+        os << indent << " with condition :" << endl;
+        if(orelse.condition) { orelse.condition->print(os, indent + 1); }
 }
 

src/SynTree/Statement.h

@@ -122 +122 @@
 };
 
+class DirectiveStmt : public Statement {
+        public:
+        std::string directive;
+
+        DirectiveStmt( const std::string & );
+        virtual ~DirectiveStmt(){}
+
+        virtual DirectiveStmt * clone() const { return new DirectiveStmt( *this ); }
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const;
+};
+
 class IfStmt : public Statement {
   public:

src/SynTree/SynTree.h

@@ -44 +44 @@
 class ExprStmt;
 class AsmStmt;
+class DirectiveStmt;
 class IfStmt;
 class WhileStmt;

src/SynTree/Visitor.h

@@ -41 +41 @@
         virtual void visit( ExprStmt * exprStmt ) = 0;
         virtual void visit( AsmStmt * asmStmt ) = 0;
+        virtual void visit( DirectiveStmt * directiveStmt ) = 0;
         virtual void visit( IfStmt * ifStmt ) = 0;
         virtual void visit( WhileStmt * whileStmt ) = 0;