Changeset 3b8e52c for src/Parser

Timestamp:

Aug 17, 2016, 11:09:11 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1cb2282, 7a5d773

Parents:

926af74

Message:

more refactoring of parser code

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• LinkageSpec.cc (modified) (3 diffs)
• LinkageSpec.h (modified) (2 diffs)
• parser.cc (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 18:00:34 2016
-// Update Count     : 179
+// Last Modified On : Wed Aug 17 11:08:56 2016
+// Update Count     : 180
 //
 
@@ -780 +780 @@
 
 DeclarationNode *DeclarationNode::appendList( DeclarationNode *node ) {
-        if ( node != 0 ) {
-                set_last( node );
-        } // if
-        return this;
+        return (DeclarationNode *)set_last( node );
 }
 

src/Parser/LinkageSpec.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:22:09 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 19 15:53:05 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 23:02:37 2016
+// Update Count     : 11
 // 
 
@@ -31 +31 @@
 
 std::string LinkageSpec::toString( LinkageSpec::Type linkage ) {
-        switch ( linkage ) {
-          case Intrinsic:
-                return "intrinsic";
-          case Cforall:
-                return "Cforall";
-          case C:
-                return "C";
-          case AutoGen:
-                return "automatically generated";
-          case Compiler:
-                return "compiler built-in";
-        }
-        assert( false );
-        return "";
+        static const char *linkageKinds[LinkageSpec::NoOfTypes] = {
+                "intrinsic", "Cforall", "C", "automatically generated", "compiler built-in",
+        };
+        return linkageKinds[linkage];
 }
 
 bool LinkageSpec::isDecoratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-                return true;
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+        static bool decoratable[LinkageSpec::NoOfTypes] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           false,  true,           false, 
+        };
+        return decoratable[ t ];
 }
 
 bool LinkageSpec::isGeneratable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case Cforall:
-          case AutoGen:
-          case C:
-                return true;
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+        static bool generatable[LinkageSpec::NoOfTypes] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           true,           true,   true,           false, 
+        };
+        return generatable[ t ];
 }
 
@@ -81 +59 @@
 
 bool LinkageSpec::isOverridable( Type t ) {
-        switch ( t ) {
-          case Intrinsic:
-          case AutoGen:
-                return true;
-          case Cforall:
-          case C:
-          case Compiler:
-                return false;
-        }
-        assert( false );
-        return false;
+        static bool overridable[LinkageSpec::NoOfTypes] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  true,           false, 
+        };
+        return overridable[ t ];
 }
 
 bool LinkageSpec::isBuiltin( Type t ) {
-        switch ( t ) {
-          case Cforall:
-          case AutoGen:
-          case C:
-                return false;
-          case Intrinsic:
-          case Compiler:
-                return true;
-        }
-        assert( false );
-        return false;
+        static bool builtin[LinkageSpec::NoOfTypes] = {
+                //      Intrinsic,      Cforall,        C,              AutoGen,        Compiler
+                        true,           false,          false,  false,          true, 
+        };
+        return builtin[ t ];
 }
 

src/Parser/LinkageSpec.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:24:28 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Aug 18 14:11:55 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 17 22:19:48 2016
+// Update Count     : 6
 //
 
@@ -25 +25 @@
                 C,                                                                                              // not overloadable, not mangled
                 AutoGen,                                                                                // built by translator (struct assignment)
-                Compiler                                                                                // gcc internal
+                Compiler,                                                                               // gcc internal
+                NoOfTypes
         };
   

src/Parser/parser.cc

@@ -7801 +7801 @@
 #line 1993 "parser.yy"
     {
-                        linkageStack.push( linkage );
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
                         linkage = LinkageSpec::fromString( *(yyvsp[(2) - (2)].tok) );
                 }

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 21:59:35 2016
-// Update Count     : 1907
+// Last Modified On : Wed Aug 17 11:18:40 2016
+// Update Count     : 1908
 //
 
@@ -1992 +1992 @@
         | EXTERN STRINGliteral
                 {
-                        linkageStack.push( linkage );
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
                         linkage = LinkageSpec::fromString( *$2 );
                 }