Changes in / [9aa9126:7a7ab42]

Files:

• .gitignore (modified) (1 diff)
• driver/Makefile.am (modified) (2 diffs)
• driver/Makefile.in (modified) (6 diffs)
• driver/cfa.cc (modified) (1 diff)
• libcfa/prelude/builtins.c (modified) (2 diffs)
• libcfa/src/bits/locks.hfa (modified) (2 diffs)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• libcfa/src/startup.cfa (modified) (1 diff)
• src/CodeGen/GenType.cc (modified) (3 diffs)
• src/Common/Eval.cc (deleted)
• src/Common/SemanticError.h (modified) (2 diffs)
• src/Common/module.mk (modified) (1 diff)
• src/Common/utility.h (modified) (2 diffs)
• src/CompilationState.cc (deleted)
• src/CompilationState.h (deleted)
• src/InitTweak/FixGlobalInit.cc (modified) (5 diffs)
• src/InitTweak/FixGlobalInit.h (modified) (1 diff)
• src/InitTweak/FixInit.cc (modified) (1 diff)
• src/InitTweak/FixInit.h (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (18 diffs)
• src/Parser/ParseNode.h (modified) (5 diffs)
• src/Parser/StatementNode.cc (modified) (5 diffs)
• src/Parser/lex.ll (modified) (2 diffs)
• src/Parser/parser.yy (modified) (8 diffs)
• src/ResolvExpr/CurrentObject.cc (modified) (2 diffs)
• src/SymTab/Validate.cc (modified) (7 diffs)
• src/SynTree/AggregateDecl.cc (modified) (2 diffs)
• src/Validate/HandleAttributes.cc (deleted)
• src/Validate/HandleAttributes.h (deleted)
• src/Validate/module.mk (deleted)
• src/driver/as.cc (deleted)
• src/main.cc (modified) (3 diffs)
• tests/.expect/attributes.x64.txt (modified) (1 diff)
• tests/.expect/attributes.x86.txt (modified) (1 diff)
• tests/function-operator.c (modified) (3 diffs)
• tests/sum.c (modified) (2 diffs)
• tests/tuple/tupleVariadic.c (modified) (5 diffs)

.gitignore

@@ -28 +28 @@
 
 # src executables, for lib and bin
-src/driver/as
+src/driver/cc1
 src/driver/cfa
 src/driver/cfa-cpp
-src/driver/cc1
 
 src/prelude/bootloader.c

driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Aug  2 12:18:25 2018
-## Update Count     : 14
+## Last Modified On : Mon Apr 30 17:44:17 2018
+## Update Count     : 11
 ###############################################################################
 
@@ -35 +35 @@
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}
-cc1lib_PROGRAMS = as cc1
-as_SOURCES = as.cc
+cc1lib_PROGRAMS = cc1
 cc1_SOURCES = cc1.cc
 
+# cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
+#       cp $(<) $(@)
+
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

driver/Makefile.in

@@ -93 +93 @@
 host_triplet = @host@
 noinst_PROGRAMS = cfa$(EXEEXT)
-cc1lib_PROGRAMS = as$(EXEEXT) cc1$(EXEEXT)
+cc1lib_PROGRAMS = cc1$(EXEEXT)
 subdir = driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -107 +107 @@
 am__installdirs = "$(DESTDIR)$(cc1libdir)"
 PROGRAMS = $(cc1lib_PROGRAMS) $(noinst_PROGRAMS)
-am_as_OBJECTS = as.$(OBJEXT)
-as_OBJECTS = $(am_as_OBJECTS)
-as_LDADD = $(LDADD)
 am_cc1_OBJECTS = cc1.$(OBJEXT)
 cc1_OBJECTS = $(am_cc1_OBJECTS)
@@ -145 +142 @@
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
-DIST_SOURCES = $(as_SOURCES) $(cc1_SOURCES) $(cfa_SOURCES)
+SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
+DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -305 +302 @@
 # put into lib for now
 cc1libdir = ${CFA_LIBDIR}
-as_SOURCES = as.cc
 cc1_SOURCES = cc1.cc
+
+# cfa-cpp$(EXEEXT): $(top_builddir)/driver/cfa-cpp$(EXEEXT)
+#       cp $(<) $(@)
 MAINTAINERCLEANFILES = $(CFA_BINDIR)/$(CFA_NAME) @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
 all: all-am
@@ -387 +386 @@
         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 
-as$(EXEEXT): $(as_OBJECTS) $(as_DEPENDENCIES) $(EXTRA_as_DEPENDENCIES) 
-        @rm -f as$(EXEEXT)
-        $(AM_V_CXXLD)$(CXXLINK) $(as_OBJECTS) $(as_LDADD) $(LIBS)
-
 cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES) 
         @rm -f cc1$(EXEEXT)
@@ -405 +400 @@
         -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/as.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfa.Po@am__quote@

driver/cfa.cc

@@ -402 +402 @@
                 args[nargs] = "--undefined=__cfaabi_appready_startup";
                 nargs += 1;
-                args[nargs] = "-Xlinker";
-                nargs += 1;
-                args[nargs] = "--undefined=__cfaabi_dbg_record";
-                nargs += 1;
 
                 // include the cfa library in case it's needed

libcfa/prelude/builtins.c

@@ -10 +10 @@
 // Created On       : Fri Jul 21 16:21:03 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug  5 21:40:38 2018
-// Update Count     : 20
+// Last Modified On : Thu Feb  8 12:47:59 2018
+// Update Count     : 19
 //
 
@@ -22 +22 @@
 
 void exit( int status, const char fmt[], ... ) __attribute__ (( format(printf, 2, 3), __nothrow__, __leaf__, __noreturn__ ));
-void abort( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
+void abort ( const char fmt[], ... ) __attribute__ (( format(printf, 1, 2), __nothrow__, __leaf__, __noreturn__ ));
 
 // increment/decrement unification

libcfa/src/bits/locks.hfa

@@ -64 +64 @@
                 extern void disable_interrupts();
                 extern void enable_interrupts_noPoll();
-
-                #ifdef __CFA_DEBUG__
-                        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
-                #else
-                        #define __cfaabi_dbg_record(x, y)
-                #endif
         }
 
@@ -77 +71 @@
                 this.lock = 0;
         }
+
+
+        #ifdef __CFA_DEBUG__
+                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+        #else
+                #define __cfaabi_dbg_record(x, y)
+        #endif
 
         // Lock the spinlock, return false if already acquired

libcfa/src/concurrency/kernel.cfa

@@ -833 +833 @@
 // Debug
 __cfaabi_dbg_debug_do(
-        extern "C" {
-                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
-                        this.prev_name = prev_name;
-                        this.prev_thrd = kernelTLS.this_thread;
-                }
+        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
+                this.prev_name = prev_name;
+                this.prev_thrd = kernelTLS.this_thread;
         }
 )

libcfa/src/startup.cfa

@@ -40 +40 @@
 
 struct __spinlock_t;
-extern "C" {
-        void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
-}
+void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
 
 // Local Variables: //

src/CodeGen/GenType.cc

@@ -27 +27 @@
 namespace CodeGen {
         struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
-                std::string typeString;
-                GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks );
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
+                std::string get_typeString() const { return typeString; }
+                void set_typeString( const std::string &newValue ) { typeString = newValue; }
 
                 void previsit( BaseSyntaxNode * );
@@ -57 +58 @@
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
 
-                bool pretty = false;    // pretty print
-                bool genC = false;      // generating C code?
-                bool lineMarks = false; // lineMarks on for CodeGenerator?
+                std::string typeString;
+                bool pretty = false; // pretty print
+                bool genC = false;   // generating C code?
+                bool lineMarks = false;
         };
 
@@ -72 +74 @@
 
                 type->accept( gt );
-                return os.str() + gt.pass.typeString;
+                return os.str() + gt.pass.get_typeString();
         }
 

src/Common/SemanticError.h

@@ -58 +58 @@
         {"aggregate-forward-decl" , "forward declaration of nested aggregate: %s"  , Severity::Warn},
         {"superfluous-decl"       , "declaration does not allocate storage: %s"    , Severity::Warn},
-        {"gcc-attributes"         , "invalid attribute: %s"                        , Severity::Warn},
 };
 
@@ -67 +66 @@
         AggrForwardDecl,
         SuperfluousDecl,
-        GccAttributes,
         NUMBER_OF_WARNINGS, // This MUST be the last warning
 };

src/Common/module.mk

@@ -19 +19 @@
        Common/DebugMalloc.cc \
        Common/Assert.cc \
-       Common/Heap.cc \
-       Common/Eval.cc
+       Common/Heap.cc

src/Common/utility.h

@@ -31 +31 @@
 #include "Common/Indenter.h"
 
-class Expression;
-
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -458 +456 @@
 } // ilog2
 
-// -----------------------------------------------------------------------------
-/// evaluates expr as a long long int. If second is false, expr could not be evaluated
-std::pair<long long int, bool> eval(Expression * expr);
 
 // Local Variables: //

src/InitTweak/FixGlobalInit.cc

@@ -37 +37 @@
         class GlobalFixer : public WithShortCircuiting {
           public:
-                GlobalFixer( bool inLibrary );
+                GlobalFixer( const std::string & name, bool inLibrary );
 
                 void previsit( ObjectDecl *objDecl );
@@ -52 +52 @@
         };
 
-        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary ) {
-                PassVisitor<GlobalFixer> visitor( inLibrary );
+        void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary ) {
+                PassVisitor<GlobalFixer> visitor( name, inLibrary );
                 acceptAll( translationUnit, visitor );
                 GlobalFixer & fixer = visitor.pass;
@@ -70 +70 @@
         }
 
-        GlobalFixer::GlobalFixer( bool inLibrary ) : tempNamer( "_global_init" ) {
+  std::string globalFunctionName( const std::string & name ) {
+        // get basename
+        std::string ret = name.substr( 0, name.find( '.' ) );
+        // replace invalid characters with _
+                static std::string invalid = "/-@";
+        replace_if( ret.begin(), ret.end(), []( char c ) { return invalid.find(c) != std::string::npos; }, '_' );
+        return ret;
+  }
+
+        GlobalFixer::GlobalFixer( const std::string & name, bool inLibrary ) : tempNamer( "_global_init" ) {
+                std::string fixedName = globalFunctionName( name );
                 std::list< Expression * > ctorParameters;
                 std::list< Expression * > dtorParameters;
@@ -80 +90 @@
                         // for library code are run before constructors and destructors for user code,
                         // specify a priority when building the library. Priorities 0-100 are reserved by gcc.
-                        // Priorities 101-200 are reserved by cfa, so use priority 200 for CFA library globals,
-                        // allowing room for overriding with a higher priority.
-                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
-                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 200 ) ) );
+                        ctorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
+                        dtorParameters.push_back( new ConstantExpr( Constant::from_int( 102 ) ) );
                 }
-                initFunction = new FunctionDecl( "__global_init__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                initFunction = new FunctionDecl( "_init_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 initFunction->get_attributes().push_back( new Attribute( "constructor", ctorParameters ) );
-                destroyFunction = new FunctionDecl( "__global_destroy__", Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
+                destroyFunction = new FunctionDecl( "_destroy_" + fixedName, Type::StorageClasses( Type::Static ), LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt() );
                 destroyFunction->get_attributes().push_back( new Attribute( "destructor", dtorParameters ) );
         }
@@ -102 +110 @@
                 if ( ConstructorInit * ctorInit = dynamic_cast< ConstructorInit * >( objDecl->get_init() ) ) {
                         // a decision should have been made by the resolver, so ctor and init are not both non-NULL
-                        assert( ! ctorInit->ctor || ! ctorInit->init );
+                        assert( ! ctorInit->get_ctor() || ! ctorInit->get_init() );
 
-                        Statement * dtor = ctorInit->dtor;
+                        Statement * dtor = ctorInit->get_dtor();
                         if ( dtor && ! isIntrinsicSingleArgCallStmt( dtor ) ) {
                                 // don't need to call intrinsic dtor, because it does nothing, but
                                 // non-intrinsic dtors must be called
                                 destroyStatements.push_front( dtor );
-                                ctorInit->dtor = nullptr;
+                                ctorInit->set_dtor( NULL );
                         } // if
-                        if ( Statement * ctor = ctorInit->ctor ) {
+                        if ( Statement * ctor = ctorInit->get_ctor() ) {
                                 initStatements.push_back( ctor );
-                                objDecl->init = nullptr;
-                                ctorInit->ctor = nullptr;
-                        } else if ( Initializer * init = ctorInit->init ) {
-                                objDecl->init = init;
-                                ctorInit->init = nullptr;
+                                objDecl->set_init( NULL );
+                                ctorInit->set_ctor( NULL );
+                        } else if ( Initializer * init = ctorInit->get_init() ) {
+                                objDecl->set_init( init );
+                                ctorInit->set_init( NULL );
                         } else {
                                 // no constructor and no initializer, which is okay
-                                objDecl->init = nullptr;
+                                objDecl->set_init( NULL );
                         } // if
                         delete ctorInit;

src/InitTweak/FixGlobalInit.h

@@ -22 +22 @@
 
 namespace InitTweak {
-        /// Moves global initialization into an _init function that is unique to the translation unit.
-        /// Sets the priority of the initialization function depending on whether the initialization
-        /// function is for library code.
-        void fixGlobalInit( std::list< Declaration * > & translationUnit, bool inLibrary );
+  /// Moves global initialization into an _init function that is unique to the translation unit.
+  /// Sets the priority of the initialization function depending on whether the initialization
+  /// function is for library code.
+  void fixGlobalInit( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
+
+  /// Apply transformations to a file name to get a valid C identifier which will be used as
+  /// the name of the generated initializer function.
+  std::string globalFunctionName( const std::string & name );
 } // namespace
 

src/InitTweak/FixInit.cc

@@ -238 +238 @@
         } // namespace
 
-        void fix( std::list< Declaration * > & translationUnit, bool inLibrary ) {
+        void fix( std::list< Declaration * > & translationUnit, const std::string & filename, bool inLibrary ) {
                 PassVisitor<SelfAssignChecker> checker;
                 acceptAll( translationUnit, checker );
 
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
-                InitTweak::fixGlobalInit( translationUnit, inLibrary );
+                InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
 
                 UnqCount unqCount;

src/InitTweak/FixInit.h

@@ -24 +24 @@
   /// replace constructor initializers with expression statements
   /// and unwrap basic C-style initializers
-        void fix( std::list< Declaration * > & translationUnit, bool inLibrary );
+        void fix( std::list< Declaration * > & translationUnit, const std::string & name, bool inLibrary );
 } // namespace
 

src/InitTweak/InitTweak.cc

@@ -408 +408 @@
                 return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
-                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->function->result );
+                                FunctionType *funcType = GenPoly::getFunctionType( appExpr->get_function()->get_result() );
                                 assert( funcType );
                                 return funcType->get_parameters().size() == 1;

src/Makefile.am

@@ -19 +19 @@
 
 SRC = main.cc \
-      MakeLibCfa.cc \
-      CompilationState.cc
+      MakeLibCfa.cc
 
 MAINTAINERCLEANFILES =
@@ -38 +37 @@
 include SynTree/module.mk
 include Tuples/module.mk
-include Validate/module.mk
 include Virtual/module.mk
 

src/Makefile.in

@@ -23 +23 @@
 #SRC +=  ArgTweak/Rewriter.cc \
 #       ArgTweak/Mutate.cc
-
-######################### -*- Mode: Makefile-Gmake -*- ########################
-###############################################################################
 
 ######################### -*- Mode: Makefile-Gmake -*- ########################
@@ -153 +150 @@
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = main.$(OBJEXT) MakeLibCfa.$(OBJEXT) \
-        CompilationState.$(OBJEXT) CodeGen/Generate.$(OBJEXT) \
-        CodeGen/CodeGenerator.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
-        CodeGen/FixNames.$(OBJEXT) CodeGen/FixMain.$(OBJEXT) \
-        CodeGen/OperatorTable.$(OBJEXT) CodeTools/DeclStats.$(OBJEXT) \
-        CodeTools/TrackLoc.$(OBJEXT) Concurrency/Keywords.$(OBJEXT) \
-        Concurrency/Waitfor.$(OBJEXT) Common/SemanticError.$(OBJEXT) \
-        Common/UniqueName.$(OBJEXT) Common/DebugMalloc.$(OBJEXT) \
-        Common/Assert.$(OBJEXT) Common/Heap.$(OBJEXT) \
-        Common/Eval.$(OBJEXT) ControlStruct/LabelGenerator.$(OBJEXT) \
+        CodeGen/Generate.$(OBJEXT) CodeGen/CodeGenerator.$(OBJEXT) \
+        CodeGen/GenType.$(OBJEXT) CodeGen/FixNames.$(OBJEXT) \
+        CodeGen/FixMain.$(OBJEXT) CodeGen/OperatorTable.$(OBJEXT) \
+        CodeTools/DeclStats.$(OBJEXT) CodeTools/TrackLoc.$(OBJEXT) \
+        Concurrency/Keywords.$(OBJEXT) Concurrency/Waitfor.$(OBJEXT) \
+        Common/SemanticError.$(OBJEXT) Common/UniqueName.$(OBJEXT) \
+        Common/DebugMalloc.$(OBJEXT) Common/Assert.$(OBJEXT) \
+        Common/Heap.$(OBJEXT) ControlStruct/LabelGenerator.$(OBJEXT) \
         ControlStruct/LabelFixer.$(OBJEXT) \
         ControlStruct/MLEMutator.$(OBJEXT) \
@@ -220 +216 @@
         Tuples/TupleAssignment.$(OBJEXT) \
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
-        Validate/HandleAttributes.$(OBJEXT) \
         Virtual/ExpandCasts.$(OBJEXT)
 am____driver_cfa_cpp_OBJECTS = $(am__objects_1)
@@ -313 +308 @@
         $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk \
         $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk \
-        $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk \
-        $(srcdir)/Virtual/module.mk $(top_srcdir)/automake/depcomp \
-        $(top_srcdir)/automake/ylwrap Parser/lex.cc Parser/parser.cc \
-        Parser/parser.hh
+        $(srcdir)/Tuples/module.mk $(srcdir)/Virtual/module.mk \
+        $(top_srcdir)/automake/depcomp $(top_srcdir)/automake/ylwrap \
+        Parser/lex.cc Parser/parser.cc Parser/parser.hh
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -446 +440 @@
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
-SRC = main.cc MakeLibCfa.cc CompilationState.cc CodeGen/Generate.cc \
+SRC = main.cc MakeLibCfa.cc CodeGen/Generate.cc \
         CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
@@ -453 +447 @@
         Concurrency/Waitfor.cc Common/SemanticError.cc \
         Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
-        Common/Heap.cc Common/Eval.cc ControlStruct/LabelGenerator.cc \
+        Common/Heap.cc ControlStruct/LabelGenerator.cc \
         ControlStruct/LabelFixer.cc ControlStruct/MLEMutator.cc \
         ControlStruct/Mutate.cc ControlStruct/ForExprMutator.cc \
@@ -495 +489 @@
         SynTree/Attribute.cc SynTree/DeclReplacer.cc \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
-        Tuples/Explode.cc Validate/HandleAttributes.cc \
-        Virtual/ExpandCasts.cc
+        Tuples/Explode.cc Virtual/ExpandCasts.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
         ${cfa_cpplib_PROGRAMS}}
@@ -515 +508 @@
 .SUFFIXES:
 .SUFFIXES: .cc .ll .o .obj .yy
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
@@ -535 +528 @@
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
-$(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__empty):
+$(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Virtual/module.mk $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -640 +633 @@
         Common/$(DEPDIR)/$(am__dirstamp)
 Common/Heap.$(OBJEXT): Common/$(am__dirstamp) \
-        Common/$(DEPDIR)/$(am__dirstamp)
-Common/Eval.$(OBJEXT): Common/$(am__dirstamp) \
         Common/$(DEPDIR)/$(am__dirstamp)
 ControlStruct/$(am__dirstamp):
@@ -873 +864 @@
 Tuples/Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
         Tuples/$(DEPDIR)/$(am__dirstamp)
-Validate/$(am__dirstamp):
-        @$(MKDIR_P) Validate
-        @: > Validate/$(am__dirstamp)
-Validate/$(DEPDIR)/$(am__dirstamp):
-        @$(MKDIR_P) Validate/$(DEPDIR)
-        @: > Validate/$(DEPDIR)/$(am__dirstamp)
-Validate/HandleAttributes.$(OBJEXT): Validate/$(am__dirstamp) \
-        Validate/$(DEPDIR)/$(am__dirstamp)
 Virtual/$(am__dirstamp):
         @$(MKDIR_P) Virtual
@@ -911 +894 @@
         -rm -f SynTree/*.$(OBJEXT)
         -rm -f Tuples/*.$(OBJEXT)
-        -rm -f Validate/*.$(OBJEXT)
         -rm -f Virtual/*.$(OBJEXT)
 
@@ -917 +899 @@
         -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CompilationState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MakeLibCfa.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
@@ -930 +911 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Assert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/DebugMalloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Eval.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/Heap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Common/$(DEPDIR)/SemanticError.Po@am__quote@
@@ -1025 +1005 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/ExpandCasts.Po@am__quote@
 
@@ -1192 +1171 @@
         -rm -f Tuples/$(DEPDIR)/$(am__dirstamp)
         -rm -f Tuples/$(am__dirstamp)
-        -rm -f Validate/$(DEPDIR)/$(am__dirstamp)
-        -rm -f Validate/$(am__dirstamp)
         -rm -f Virtual/$(DEPDIR)/$(am__dirstamp)
         -rm -f Virtual/$(am__dirstamp)
@@ -1210 +1187 @@
 
 distclean: distclean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -1256 +1233 @@
 
 maintainer-clean: maintainer-clean-am
-        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  4 09:39:40 2018
-// Update Count     : 853
+// Last Modified On : Fri Jul 20 14:56:30 2018
+// Update Count     : 850
 //
 
@@ -132 +132 @@
         void printOneLine( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const {}
 
-        Expression *get_expr() const { return expr.get(); }
         template<typename T>
         bool isExpressionType() const { return nullptr != dynamic_cast<T>(expr.get()); }
@@ -391 +390 @@
 Statement * build_expr( ExpressionNode * ctl );
 
-struct IfCtrl {
-        IfCtrl( DeclarationNode * decl, ExpressionNode * condition ) :
+struct IfCtl {
+        IfCtl( DeclarationNode * decl, ExpressionNode * condition ) :
                 init( decl ? new StatementNode( decl ) : nullptr ), condition( condition ) {}
 
@@ -399 +398 @@
 };
 
-struct ForCtrl {
-        ForCtrl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
+struct ForCtl {
+        ForCtl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
                 init( new StatementNode( build_expr( expr ) ) ), condition( condition ), change( change ) {}
-        ForCtrl( DeclarationNode * decl, ExpressionNode * condition, ExpressionNode * change ) :
+        ForCtl( DeclarationNode * decl, ExpressionNode * condition, ExpressionNode * change ) :
                 init( new StatementNode( decl ) ), condition( condition ), change( change ) {}
 
@@ -410 +409 @@
 };
 
-Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init );
-Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init );
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
 Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt );
 Statement * build_case( ExpressionNode * ctl );
 Statement * build_default();
-Statement * build_while( IfCtrl * ctl, StatementNode * stmt );
+Statement * build_while( IfCtl * ctl, StatementNode * stmt );
 Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
-Statement * build_for( ForCtrl * forctl, StatementNode * stmt );
+Statement * build_for( ForCtl * forctl, StatementNode * stmt );
 Statement * build_branch( BranchStmt::Type kind );
 Statement * build_branch( std::string * identifier, BranchStmt::Type kind );

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug  4 09:39:25 2018
-// Update Count     : 363
+// Last Modified On : Tue Jun  5 08:58:34 2018
+// Update Count     : 362
 //
 
@@ -78 +78 @@
 } // build_expr
 
-Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init ) {
+Expression * build_if_control( IfCtl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
@@ -100 +100 @@
 } // build_if_control
 
-Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
         Statement * thenb, * elseb = nullptr;
         std::list< Statement * > branches;
@@ -145 +145 @@
 } // build_default
 
-Statement * build_while( IfCtrl * ctl, StatementNode * stmt ) {
+Statement * build_while( IfCtl * ctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
@@ -164 +164 @@
 } // build_do_while
 
-Statement * build_for( ForCtrl * forctl, StatementNode * stmt ) {
+Statement * build_for( ForCtl * forctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Wed Aug  8 17:23:17 2018
- * Update Count     : 685
+ * Last Modified On : Wed Jun 20 09:08:28 2018
+ * Update Count     : 682
  */
 
@@ -410 +410 @@
 ">>="                   { NAMEDOP_RETURN(RSassign); }
 
-"~="                    { NAMEDOP_RETURN(Erange); }                             // CFA
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  8 17:50:07 2018
-// Update Count     : 3998
+// Last Modified On : Wed Jul 25 15:54:35 2018
+// Update Count     : 3841
 //
 
@@ -186 +186 @@
 } // fieldDecl
 
-ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        return new ForCtrl(
-                distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
-                new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
-                new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
-} // forCtrl
-
-
 bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 
@@ -225 +217 @@
         WaitForStmt * wfs;
         Expression * constant;
-        IfCtrl * ifctl;
-        ForCtrl * fctl;
-        enum OperKinds compop;
+        IfCtl * ifctl;
+        ForCtl * fctl;
         LabelNode * label;
         InitializerNode * in;
@@ -290 +281 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
-%token Erange                                                                                   // ~=
 %token ATassign                                                                                 // @=
 
@@ -313 +303 @@
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression
-%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
@@ -1060 +1049 @@
 if_control_expression:
         comma_expression
-                { $$ = new IfCtrl( nullptr, $1 ); }
+                { $$ = new IfCtl( nullptr, $1 ); }
         | c_declaration                                                                         // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
+                { $$ = new IfCtl( $1, nullptr ); }
         | cfa_declaration                                                                       // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
+                { $$ = new IfCtl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
-                { $$ = new IfCtrl( $1, $2 ); }
+                { $$ = new IfCtl( $1, $2 ); }
         ;
 
@@ -1122 +1111 @@
         WHILE '(' push if_control_expression ')' statement pop
                 { $$ = new StatementNode( build_while( $4, $6 ) ); }
-        | WHILE '(' ')' statement                                                       // CFA => while ( 1 )
-                { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), $4 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
                 { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
-        | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
-                { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), $2 ) ); }
         | FOR '(' push for_control_expression ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
@@ -1133 +1118 @@
 
 for_control_expression:
-        comma_expression_opt                                                            // CFA
-                {
-                        if ( ! $1 ) {                                                           // => for ( ;; )
-                                $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
-                        } else {
-                                $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $1->clone(),
-                                                         new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                        } // if
-                }
-        | constant_expression inclexcl constant_expression      // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
-        | comma_expression_opt ';' comma_expression                     // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else if ( ! $3 ) {
-                                SemanticError( yylloc, "Missing loop range." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $3->clone(),
-                                                                 new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtrl( $1, $3, $5 ); }
-        | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
-                { $$ = new ForCtrl( $1, $2, $4 ); }
-        ;
-
-inclexcl:
-        '~'
-                { $$ = OperKinds::LThan; }
-        | Erange
-                { $$ = OperKinds::LEThan; }
+        comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtl( $1, $3, $5 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99
+                { $$ = new ForCtl( $1, $2, $4 ); }
         ;
 

src/ResolvExpr/CurrentObject.cc

@@ -139 +139 @@
                 ArrayIterator( ArrayType * at ) : array( at ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
-                        base = at->base;
+                        base = at->get_base();
                         memberIter = createMemberIterator( base );
-                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=: " );
-                        setSize( at->dimension );
+                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=" );
+                        setSize( at->get_dimension() );
                 }
 
@@ -150 +150 @@
 
         private:
-                void setSize( Expression * expr ) { // replace this logic with an eval call
-                        auto res = eval(expr);
-                        if (res.second) {
-                                size = res.first;
+                void setSize( Expression * expr ) {
+                        if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
+                                try {
+                                        size = constExpr->intValue();
+                                        PRINT( std::cerr << "array type with size: " << size << std::endl; )
+                                } catch ( SemanticErrorException & ) {
+                                        SemanticError( expr, "Constant expression of non-integral type in array dimension: " );
+                                }
+                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                                setSize( castExpr->get_arg() ); // xxx - need to perform the conversion specified by the cast
+                        } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
+                                if ( EnumInstType * inst = dynamic_cast< EnumInstType * > ( varExpr->result ) ) {
+                                        long long int value;
+                                        if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
+                                                size = value;
+                                        }
+                                }
                         } else {
-                                SemanticError( expr->location, toString("Array designator must be a constant expression: ", expr) );
+                                assertf( false, "unhandled expression in setSize: %s", toString( expr ).c_str() ); // xxx - if not a constant expression, it's not simple to determine how long the array actually is, which is necessary for initialization to be done correctly -- fix this
                         }
                 }

src/SymTab/Validate.cc

@@ -61 +61 @@
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
-#include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "SymTab/Autogen.h"            // for SizeType
 #include "SynTree/Attribute.h"         // for noAttributes, Attribute
@@ -73 +72 @@
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "SynTree/Visitor.h"           // for Visitor
-#include "Validate/HandleAttributes.h" // for handleAttributes
 
 class CompoundStmt;
@@ -249 +247 @@
         };
 
-        struct ArrayLength : public WithIndexer {
+        struct ArrayLength {
                 /// for array types without an explicit length, compute the length and store it so that it
                 /// is known to the rest of the phases. For example,
@@ -260 +258 @@
 
                 void previsit( ObjectDecl * objDecl );
-                void previsit( ArrayType * arrayType );
         };
 
@@ -315 +312 @@
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
-                Validate::handleAttributes( translationUnit );
         }
 
@@ -738 +734 @@
                                 forwardEnums.erase( fwds );
                         } // if
-
-                        for ( Declaration * member : enumDecl->members ) {
-                                ObjectDecl * field = strict_dynamic_cast<ObjectDecl *>( member );
-                                if ( field->init ) {
-                                        // need to resolve enumerator initializers early so that other passes that determine if an expression is constexpr have the appropriate information.
-                                        SingleInit * init = strict_dynamic_cast<SingleInit *>( field->init );
-                                        ResolvExpr::findSingleExpression( init->value, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), indexer );
-                                }
-                        }
                 } // if
         }
@@ -1245 +1232 @@
         void ArrayLength::previsit( ObjectDecl * objDecl ) {
                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->type ) ) {
-                        if ( at->dimension ) return;
+                        if ( at->get_dimension() ) return;
                         if ( ListInit * init = dynamic_cast< ListInit * >( objDecl->init ) ) {
-                                at->dimension = new ConstantExpr( Constant::from_ulong( init->initializers.size() ) );
-                        }
-                }
-        }
-
-        void ArrayLength::previsit( ArrayType * type ) {
-                if ( type->dimension ) {
-                        // need to resolve array dimensions early so that constructor code can correctly determine
-                        // if a type is a VLA (and hence whether its elements need to be constructed)
-                        ResolvExpr::findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
-
-                        // must re-evaluate whether a type is a VLA, now that more information is available
-                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
-                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                                at->set_dimension( new ConstantExpr( Constant::from_ulong( init->initializers.size() ) ) );
+                        }
                 }
         }

src/SynTree/AggregateDecl.cc

@@ -86 +86 @@
 std::string TraitDecl::typeString() const { return "trait"; }
 
+namespace {
+        long long int getConstValue( Expression * expr ) {
+                if ( CastExpr * castExpr = dynamic_cast< CastExpr * > ( expr ) ) {
+                        return getConstValue( castExpr->arg );
+                } else if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
+                        return constExpr->intValue();
+                // can be -1, +1, etc.
+                // } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
+                //      if ( untypedExpr-> )
+                } else {
+                        assertf( false, "Unhandled expression type in getConstValue for enumerators: %s", toString( expr ).c_str() );
+                }
+        }
+}
+
 bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {
         if ( enumValues.empty() ) {
@@ -93 +108 @@
                         if ( field->init ) {
                                 SingleInit * init = strict_dynamic_cast< SingleInit * >( field->init );
-                                auto result = eval( init->value );
-                                if ( ! result.second ) SemanticError( init->location, toString( "Non-constexpr in initialization of enumerator: ", field ) );
-                                currentValue = result.first;
+                                currentValue = getConstValue( init->value );
                         }
                         assertf( enumValues.count( field->name ) == 0, "Enum %s has multiple members with the name %s", name.c_str(), field->name.c_str() );

src/main.cc

@@ -28 +28 @@
 #include <string>                           // for char_traits, operator<<
 
-#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
@@ -73 +72 @@
 DeclarationNode * parseTree = nullptr;                                  // program parse tree
 
+extern int yydebug;                                                                             // set for -g flag (Grammar)
+bool
+        astp = false,
+        bresolvep = false,
+        bboxp = false,
+        bcodegenp = false,
+        ctorinitp = false,
+        declstatsp = false,
+        exprp = false,
+        expraltp = false,
+        genericsp = false,
+        libcfap = false,
+        nopreludep = false,
+        noprotop = false,
+        nomainp = false,
+        parsep = false,
+        resolvep = false,                                                                       // used in AlternativeFinder
+        symtabp = false,
+        treep = false,
+        tuplep = false,
+        validp = false,
+        errorp = false,
+        codegenp = false,
+        prettycodegenp = false,
+        linemarks = false;
+
 std::string PreludeDirector = "";
 
@@ -278 +303 @@
 
                 // fix ObjectDecl - replaces ConstructorInit nodes
-                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
+                PASS( "fixInit", InitTweak::fix( translationUnit, filename, libcfap || treep ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );

tests/.expect/attributes.x64.txt

@@ -316 +316 @@
     ((void)sizeof(__attribute__ ((unused,unused)) signed int ));
     ((void)sizeof(__attribute__ ((unused,unused,unused,unused)) signed int **));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [((unsigned long int )5)]));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[((unsigned long int )10)]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [5]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
     struct __attribute__ ((unused)) __anonymous3 {

tests/.expect/attributes.x86.txt

@@ -316 +316 @@
     ((void)sizeof(__attribute__ ((unused,unused)) signed int ));
     ((void)sizeof(__attribute__ ((unused,unused,unused,unused)) signed int **));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [((unsigned int )5)]));
-    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[((unsigned int )10)]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int [5]));
+    ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int (*)[10]));
     ((void)sizeof(__attribute__ ((unused,unused,unused)) signed int ()));
     struct __attribute__ ((unused)) __anonymous3 {

tests/function-operator.c

@@ -10 +10 @@
 // Created On       : Fri Aug 25 15:21:11 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  2 09:27:53 2018
-// Update Count     : 8
+// Last Modified On : Thu Dec  7 12:42:26 2017
+// Update Count     : 6
 //
 
@@ -92 +92 @@
 void ?{}(ostream_iterator & iter, ofstream * out) {
         iter.out = new(out);
-}
+                }
 // no destructor, memory leak. This is necessary for this to work at the moment, since
 // *? requires its parameter by value and returns a reference.
@@ -168 +168 @@
         transform(begin(x), end(x), begin(x), &times2);
         copy(begin(x), end(x), out_iter);
-
-        // REMOVE WHEN ?* PROBLEM FIXED.
-        delete(out_iter.out);
 }
 

tests/sum.c

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  2 08:03:09 2018
-// Update Count     : 279
+// Last Modified On : Sun Jun  3 19:23:41 2018
+// Update Count     : 278
 //
 
@@ -115 +115 @@
         sout | "sum from" | low | "to" | High | "is"
                  | sum( size, gs.x ) | ", check" | (int)s | endl; // add field array in generic type
-        delete( gs.x );
 } // main
 

tests/tuple/tupleVariadic.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri Dec 16 10:25:35 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  2 09:24:04 2018
-// Update Count     : 6
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Dec 21 14:42:48 2016
+// Update Count     : 2
 //
-
-#include <stdlib>
 
 void func(void) {
@@ -30 +28 @@
         printf("called process(double) %g\n", x);
 }
+
+forall( dtype T, ttype Params | sized(T) | { void ?{}(T &, Params); } )
+T * new(Params p);
 
 struct array {
@@ -65 +66 @@
         a.data[2] = a2;
         printf("called ?{} with a: %d %d %d\n", a0, a1, a2);
-}
-
-void ^?{}(array & a) {
-        free(a.data);
 }
 
@@ -129 +126 @@
                 bar(x);
         }
-
-        delete(ptr);
-        delete(x4);
-        delete(x3);
-        delete(x2);
-        delete(x1);
-        delete(x0);
 }
 
@@ -141 +131 @@
 // tab-width: 4 //
 // End: //
+