Changes between Version 34 and Version 35 of AST

Timestamp:

04/23/11 11:33:50 (15 years ago)

Author:

Stephen Siegel

Comment:

--

AST

@@ -96 +96 @@
         * methods
            * EnumElementNodeIF
+     * StatementReferenceNodeIF
+        * methods
+           * StatementNodeIF
  * IdentifierNodeIF: wraps a string. represents an identifier occurrence in code.   Has 0 children, i.e., is a leaf node.
     * methods
@@ -161 +164 @@
  * LabelNodeIF: a label preceding a statement
     * methods
-        * statement: StatementNodeIF : the statement this label precedes (this may be null at first)
+        * statement: StatementReferenceNodeIF : the statement this label precedes (this may be null at first)
         * identifier: IdentifierNodeIF: the name of this label
  * StatementNodeIF
     * methods
        * labels: Collection<LabelNodeIF>: set of labels associated to this statement.   The labels all correspond to the point of control just before the statement.
-    * AssertStatementNodeIF: this could come from a program language assert or a TASS pragma
-       * methods
-          * expr: Expression
-    * AssumeStatementNodeIF: these come from TASS pragmas
+    * AssertStatementNodeIF
+       * this could come from a program language assert or a TASS pragma
+       * methods
+          * expr: ExpressionNodeIF
+    * AssumeStatementNodeIF
+      * these come from TASS pragmas
       * methods
-          * expr: Expression
-    * PragmaNodeIF:(any kind of pragma, represented as just a string
+          * expr: ExpressionNodeIF
+    * PragmaNodeIF
+       * any kind of pragma, represented as just a string
        * methods
           * string: this is an initial form, where the text of the pragma is uninterpreted.   After a certain processing stage, TASS pragmas will be parsed and replaced with more specific nodes.  Non-tass pragmas will just remain as strings and will be ignored by TASS.
-    * SwitchStatementNodeIF: this can be used to model C's switch
+    * SwitchStatementNodeIF
+       * can be used to model C's switch, for example
        * methods
           * expression: ExpressionNodeIF: expression that is evaluated
           * numCases: int
-          * case(int i): ValueLocationPairNodeIF (ordered pair (v,l), where v is a ValueNodeIF, and l is an ASTStatementNodeIF)
-          * default: ValueLocationPairNodeIF
+          * case(int i): Pair<ExpressionNodeIF,LabelReferenceNodeIF>
+             * the expression is the value (usually literal) the switch expression might match; the label refers to a point in body of the switch statement
+          * default: LabelReferenceNodeIF : where to go if none of the other cases is matched
+          * body : StatementNodeIF
     * IfThenElseStatementNodeIF
       * methods
@@ -186 +195 @@
          * trueBranch: StatementNodeIF
          * falseBranch: StatementNodeIF (may be null)
-    * WhileLoopNodeIF: loop.   associated invariant (derived from TASS invariant pragma)
+    * WhileLoopNodeIF: loop
+       * associated invariant (derived from TASS invariant pragma)
        * methods
           * condition: ExpressionNodeIF
@@ -215 +225 @@
              * ADD, ADD_POINTER_INT, ADDRESS_OF, BIT_AND, BIT_NOT, BIT_OR, BIT_XOR, DEREFERENCE, DIVIDE, EQUALS, GREATER_THAN, GTE, IF_THEN_ELSE, LEQ, LESS_THAN, LOGICAL_AND, LOGICAL_NOT, LOGICAL_OR, MODULO, MULTIPLY, NAVIGATE (DOT), NEGATIVE, NOT_EQUALS, SHIFT_LEFT, SHIFT_RIGHT, SUBSCRIPT, SUBTRACT, SUBTRACT_POINTER_INT, SUBTRACT_POINTER_POINTER
           * CastNodeIF
-             * newType: TypeNodeIF (type you are casting to)
+             * newType: TypeReferenceNodeIF (type you are casting to)
              * expression: ExpressionNodeIF
           * QuantifierNodeIF