Changeset 5f2f2d7 for src/Parser/ExpressionNode.cc

Timestamp:

Jun 8, 2015, 8:56:35 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

81419b5

Parents:

cd623a4

Message:

fix constant types, remove unnecessary string copying, work on regression testing, fix several memory leaks

File:

• src/Parser/ExpressionNode.cc (modified) (5 diffs)

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 07:58:00 2015
-// Update Count     : 135
+// Last Modified On : Mon Jun  8 17:33:40 2015
+// Update Count     : 147
 // 
 
@@ -93 +93 @@
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
-// Very difficult to separate extra parts of constants during lexing because actions are not allow in the middle of
-// patterns:
+// Difficult to separate extra parts of constants during lexing because actions are not allow in the middle of patterns:
 //
 //              prefix action constant action suffix
@@ -130 +129 @@
                                 } // if
                         } else {                                                                        // decimal constant ?
-                                sscanf( (char *)value.c_str(), "%lld", &v );
+                                sscanf( (char *)value.c_str(), "%llu", &v );
                                 //printf( "%llu %llu\n", v, v );
                         } // if
@@ -136 +135 @@
                         if ( v <= INT_MAX ) {                                           // signed int
                                 size = 0;
-                        } else if ( v <= UINT_MAX ) {                           // unsigned int
+                        } else if ( v <= UINT_MAX && ! dec ) {          // unsigned int
                                 size = 0;
-                                if ( ! dec ) Unsigned = true;                   // unsigned
+                                Unsigned = true;                                                // unsigned
                         } else if ( v <= LONG_MAX ) {                           // signed long int
                                 size = 1;
-                        } else if ( v <= ULONG_MAX ) {                          // signed long int
+                        } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int
                                 size = 1;
-                                if ( ! dec ) Unsigned = true;                   // unsigned long int
+                                Unsigned = true;                                                // unsigned long int
                         } else if ( v <= LLONG_MAX ) {                          // signed long long int
                                 size = 2;
-                        } else {                                                                        // signed long long int
+                        } else {                                                                        // unsigned long long int
                                 size = 2;
-                                if ( ! dec ) Unsigned = true;                   // unsigned long long int
+                                Unsigned = true;                                                // unsigned long long int
                         } // if
 
                         if ( checkU( value[last] ) ) {                          // suffix 'u' ?
                                 Unsigned = true;
-                                if ( checkL( value[ last - 1 ] ) ) {    // suffix 'l' ?
+                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'l' ?
                                         size = 1;
-                                        if ( checkL( value[ last - 1 ] ) ) { // suffix 'll' ?
+                                        if ( last > 1 && checkL( value[ last - 2 ] ) ) { // suffix 'll' ?
                                                 size = 2;
                                         } // if
@@ -161 +160 @@
                         } else if ( checkL( value[ last ] ) ) {         // suffix 'l' ?
                                 size = 1;
-                                if ( checkL( value[ last - 1 ] ) ) {    // suffix 'll' ?
+                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'll' ?
                                         size = 2;
-                                } // if
-                                if ( checkU( value[ last - 1 ] ) ) {    // suffix 'u' ?
-                                        Unsigned = true;
+                                        if ( last > 1 && checkU( value[ last - 2 ] ) ) { // suffix 'u' ?
+                                                Unsigned = true;
+                                        } // if
+                                } else {
+                                        if ( last > 0 && checkU( value[ last - 1 ] ) ) { // suffix 'u' ?
+                                                Unsigned = true;
+                                        } // if
                                 } // if
                         } // if