Changeset 6165ce7

Timestamp:

Jul 27, 2017, 12:37:31 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

a04ce4d

Parents:

7bd1bb5

Message:

remove old zero/one constant, replaced by zero_t/one_t types

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (4 diffs)
• ParseNode.h (modified) (2 diffs)
• lex.ll (modified) (2 diffs)
• parser.yy (modified) (6 diffs)

src/Parser/ExpressionNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:17:07 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 10:11:00 2017
-// Update Count     : 551
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 27 12:10:10 2017
+// Update Count     : 556
 //
 
@@ -62 +62 @@
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
-        unsigned long long int v;                                                               // converted integral value
+        unsigned long long int v;                                                       // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
-
+        Expression * ret;
+
+        // special constants
+        if ( str == "0" ) {
+                ret = new ConstantExpr( Constant( (Type *)new ZeroType( noQualifiers ), str, (unsigned long long int)0 ) );
+                goto CLEANUP;
+        } // if
+        if ( str == "1" ) {
+                ret = new ConstantExpr( Constant( (Type *)new OneType( noQualifiers ), str, (unsigned long long int)1 ) );
+                goto CLEANUP;
+        } // if
+        
         if ( str[0] == '0' ) {                                                          // octal/hex constant ?
                 dec = false;
@@ -118 +129 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+        ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[Unsigned][size] ), str, v ) );
+  CLEANUP:
         delete &str;                                                                            // created by lex
         return ret;
@@ -174 +186 @@
         return ret;
 } // build_constantStr
-
-Expression *build_constantZeroOne( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( noQualifiers ) : (Type*)new OneType( noQualifiers ), str,
-                                                                                                   str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
-        delete &str;                                                                            // created by lex
-        return ret;
-} // build_constantChar
 
 Expression * build_field_name_FLOATINGconstant( const std::string & str ) {

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 10:09:00 2017
-// Update Count     : 787
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 27 12:08:08 2017
+// Update Count     : 788
 //
 
@@ -159 +159 @@
 Expression * build_constantFloat( const std::string &str );
 Expression * build_constantChar( const std::string &str );
-Expression * build_constantZeroOne( const std::string &str );
 ConstantExpr * build_constantStr( const std::string &str );
 Expression * build_field_name_FLOATINGconstant( const std::string & str );

src/Parser/lex.ll

@@ -10 +10 @@
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
- * Last Modified On : Mon Jul 24 08:27:23 2017
- * Update Count     : 545
+ * Last Modified On : Thu Jul 27 12:05:50 2017
+ * Update Count     : 549
  */
 
@@ -288 +288 @@
 
                                 /* numeric constants */
-"0"                             { NUMERIC_RETURN(ZERO); }                               // CFA
-"1"                             { NUMERIC_RETURN(ONE); }                                // CFA
 {decimal_constant} { NUMERIC_RETURN(INTEGERconstant); }
 {octal_constant} { NUMERIC_RETURN(INTEGERconstant); }

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 10:07:00 2017
-// Update Count     : 2464
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 27 12:08:08 2017
+// Update Count     : 2467
 //
 
@@ -142 +142 @@
 // converted into the tuple index (.)(1). e.g., 3.x
 %token<tok>     REALDECIMALconstant     REALFRACTIONconstant    FLOATINGconstant
-%token<tok> ZERO                                ONE                                             // CFA
 
 // multi-character operators
@@ -159 +158 @@
 %token ATassign                                                                                 // @=
 
-%type<tok> identifier  no_attr_identifier  zero_one
+%type<tok> identifier  no_attr_identifier
 %type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  attr_name
 %type<constant> string_literal
@@ -360 +359 @@
         ;
 
-zero_one:                                                                                               // CFA
-        ZERO
-        | ONE
-        ;
-
 string_literal:
         string_literal_list                                                     { $$ = build_constantStr( *$1 ); }
@@ -384 +378 @@
         IDENTIFIER                                                                                      // typedef name cannot be used as a variable name
                 { $$ = new ExpressionNode( build_varref( $1 ) ); }
-        | zero_one
-                { $$ = new ExpressionNode( build_constantZeroOne( *$1 ) ); }
         | tuple
         | '(' comma_expression ')'
@@ -484 +476 @@
                 {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
-                }
-        | zero_one fraction_constants
-                {
-                        $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantZeroOne( *$1 ), $2 ) );
                 }
         ;