Changeset 861799c for src

Timestamp:

Mar 10, 2017, 11:00:13 AM (8 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:

c857ad3

Parents:

0e7ea335

Message:

fix 0,1 member access, fix autogenerated routines missing size for sized generic types

Location:

src

Files:

• Parser/parser.yy (modified) (1 diff)
• SymTab/Autogen.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/TypeDecl.cc (modified) (1 diff)

src/Parser/parser.yy

@@ -410 +410 @@
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_REALFRACTIONconstant( *$2 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_varref( $3 ) ) ); }
+                {
+                        $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
+                }
         | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
                         { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
+        | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }

src/SymTab/Autogen.cc

@@ -151 +151 @@
         bool hasDynamicLayout( AggrDecl * aggregateDecl ) {
                 for ( TypeDecl * param : aggregateDecl->get_parameters() ) {
-                        if ( param->get_kind() == TypeDecl::Any ) return true;
+                        if ( param->isComplete() ) return true;
                 }
                 return false;

src/SymTab/Validate.cc

@@ -224 +224 @@
                 HoistStruct::hoistStruct( translationUnit );
                 ReturnTypeFixer::fix( translationUnit ); // must happen before autogen
+                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                 autogenerateRoutines( translationUnit ); // moved up, used to be below compoundLiteral - currently needs EnumAndPointerDecayPass
                 acceptAll( translationUnit, epc );
-                acceptAll( translationUnit, lrt );
                 ReturnChecker::checkFunctionReturns( translationUnit );
                 compoundliteral.mutateDeclarationList( translationUnit );
@@ -838 +838 @@
                 assertf( retVals.size() == 0 || retVals.size() == 1, "Function %s has too many return values: %d", functionDecl->get_name().c_str(), retVals.size() );
                 if ( retVals.size() == 1 ) {
-                        // ensure all function return values have a name - use the name of the function to disambiguate (this also provides a nice bit of help for debugging)
-                        // ensure other return values have a name
+                        // ensure all function return values have a name - use the name of the function to disambiguate (this also provides a nice bit of help for debugging).
+                        // ensure other return values have a name.
                         DeclarationWithType * ret = retVals.front();
                         if ( ret->get_name() == "" ) {

src/SynTree/TypeDecl.cc

@@ -25 +25 @@
 
 std::string TypeDecl::typeString() const {
-        static const char *kindNames[] = { "type", "incomplete type", "function type", "tuple type" };
-        return kindNames[ kind ];
+        static const std::string kindNames[] = { "type", "incomplete type", "function type", "tuple type" };
+        return (kind != Any && isComplete() ? "sized " : "") + kindNames[ kind ];
 }