Changeset b6fe7e6 for src/Parser

Timestamp:

Sep 9, 2016, 1:58:07 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

03e3117

Parents:

d1969a6

Message:

make constructor expressions work, fix bug with using the wrong TypeEnvironment on member exprs, remove many unnecessary ctor/dtors from the prelude

Location:

src/Parser

Files:

• parser.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/parser.cc

@@ -5111 +5111 @@
     {
                         Token fn;
-                        fn.str = new std::string( "?{}" ); // location undefined
-                        (yyval.en) = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_last( (yyvsp[(3) - (4)].en) ) ) );
+                        fn.str = new std::string( "?{}" ); // location undefined - use location of '{'?
+                        (yyval.en) = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( (yyvsp[(1) - (4)].en) )->set_last( (yyvsp[(3) - (4)].en) ) ) ) );
                 }
     break;

src/Parser/parser.yy

@@ -389 +389 @@
                 {
                         Token fn;
-                        fn.str = new std::string( "?{}" ); // location undefined
-                        $$ = new ExpressionNode( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) );
+                        fn.str = new std::string( "?{}" ); // location undefined - use location of '{'?
+                        $$ = new ExpressionNode( new ConstructorExpr( build_func( new ExpressionNode( build_varref( fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
                 }
         ;