Changes in / [9617533:47dd0d2]

Files:

• src/AST/Pass.hpp (modified) (2 diffs)
• src/AST/Pass.impl.hpp (modified) (2 diffs)
• src/AST/TypeSubstitution.hpp (modified) (3 diffs)
• src/ResolvExpr/Unify.cc (modified) (1 diff)
• tests/errors/.expect/completeType.x86.txt (modified) (4 diffs)

src/AST/Pass.hpp

@@ -48 +48 @@
 //
 // Several additional features are available through inheritance
-// | PureVisitor           - makes the visitor pure, it never modifies nodes in place and always
-//                           clones nodes it needs to make changes to
 // | WithTypeSubstitution  - provides polymorphic const TypeSubstitution * env for the
 //                           current expression
@@ -269 +267 @@
 /// Keep track of the polymorphic const TypeSubstitution * env for the current expression
 
-/// If used the visitor will always clone nodes.
+/// marker to force shallow copies in pass visit
 struct PureVisitor {};
 

src/AST/Pass.impl.hpp

@@ -21 +21 @@
 
 #include "AST/TypeSubstitution.hpp"
+// #include "AST/Copy.hpp"
 
 #define VISIT_START( node ) \
@@ -328 +329 @@
 
                 if( __pass::differs(old_val, new_val) ) {
+                        // auto new_parent = mutate(parent);
                         auto new_parent = __pass::mutate<core_t>(parent);
                         new_parent->*child = new_val;

src/AST/TypeSubstitution.hpp

@@ -46 +46 @@
         template< typename SynTreeClass >
         struct ApplyResult {
+                // const SynTreeClass * node;
                 ast::ptr<SynTreeClass> node;
                 int count;
@@ -186 +187 @@
         assert( input );
         Pass<Substituter> sub( *this, false );
+//      input = strict_dynamic_cast< const SynTreeClass * >( deepCopy(input)->accept( sub ) );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
         return { input, sub.core.subCount };
@@ -194 +196 @@
         assert( input );
         Pass<Substituter> sub( *this, true );
+//      input = strict_dynamic_cast< const SynTreeClass * >( deepCopy(input)->accept( sub ) );
         input = strict_dynamic_cast< const SynTreeClass * >( input->accept( sub ) );
         return { input, sub.core.subCount };

src/ResolvExpr/Unify.cc

@@ -1113 +1113 @@
                         ast::Pass<TtypeExpander_new> expander{ tenv };
 
+                        // ast::ptr<ast::TupleType> tuplec = tuple;
+                        // ast::ptr<ast::TupleType> tuple2c = tuple2;
                         const ast::Type * flat = tuple->accept( expander );
                         const ast::Type * flat2 = tuple2->accept( expander );

tests/errors/.expect/completeType.x86.txt

@@ -6 +6 @@
     Name: x
 
-... to: nothing Alternatives are:
+... to: nothing
+with resolved type:
+  void  Alternatives are:
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -20 +22 @@
 
 
+        with resolved type:
+          pointer to forall
+            _89_4_DT: data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type _89_4_DT (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type _89_4_DT (not function type)
+            ... with attributes:
+              Attribute with name: unused
+
+
       ... to arguments
         Variable Expression: x: pointer to instance of struct A with body 0
-
+        with resolved type:
+          pointer to instance of struct A with body 0
+
+      with resolved type:
+        reference to instance of struct A with body 0
     ... to: nothing
+    with resolved type:
+      void 
   (types:
     void 
@@ -43 +63 @@
 
 
+        with resolved type:
+          pointer to forall
+            _89_4_DT: data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type _89_4_DT (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type _89_4_DT (not function type)
+            ... with attributes:
+              Attribute with name: unused
+
+
       ... to arguments
         Variable Expression: x: pointer to instance of struct B with body 1
-
+        with resolved type:
+          pointer to instance of struct B with body 1
+
+      with resolved type:
+        reference to instance of struct B with body 1
     ... to: nothing
+    with resolved type:
+      void 
   (types:
     void 
@@ -121 +159 @@
             ... returning nothing
 
+            with resolved type:
+              pointer to forall
+                _108_0_T: sized data type
+                ... with assertions
+                  ?=?: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                    instance of type _108_0_T (not function type)
+                  ... returning
+                    _retval__operator_assign: instance of type _108_0_T (not function type)
+                    ... with attributes:
+                      Attribute with name: unused
+
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                    instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+                  ^?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type _108_0_T (not function type)
+                  ... returning nothing
+
+
+                function
+              ... with parameters
+                pointer to instance of type _108_0_T (not function type)
+              ... returning nothing
+
           ... to arguments
             Variable Expression: z: pointer to instance of type T (not function type)
-
+            with resolved type:
+              pointer to instance of type T (not function type)
+
+          with resolved type:
+            void 
         (types:
           void