Changeset caa649b for src/Parser/ExpressionNode.cc

Timestamp:

Mar 6, 2018, 12:11:11 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

520145b, e5d4e5c, e6c5e79

Parents:

094476d (diff), 1feb535f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (4 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 : Wed Sep 27 22:51:55 2017
-// Update Count     : 781
+// Last Modified On : Sat Mar  3 18:22:33 2018
+// Update Count     : 796
 //
 
@@ -58 +58 @@
 static inline bool checkD( char c ) { return c == 'd' || c == 'D'; }
 static inline bool checkI( char c ) { return c == 'i' || c == 'I'; }
+static inline bool checkB( char c ) { return c == 'b' || c == 'B'; }
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
 
@@ -116 +117 @@
 
         unsigned long long int v;                                                       // converted integral value
-        size_t last = str.length() - 1;                                         // last character of constant
+        size_t last = str.length() - 1;                                         // last subscript of constant
         Expression * ret;
 
@@ -129 +130 @@
         } // if
 
-        if ( str[0] == '0' ) {                                                          // octal/hex constant ?
+        // Cannot be "0"
+
+        if ( str[0] == '0' ) {                                                          // radix character ?
                 dec = false;
-                if ( last != 0 && checkX( str[1] ) ) {                  // hex constant ?
+                if ( checkX( str[1] ) ) {                                               // hex constant ?
                         sscanf( (char *)str.c_str(), "%llx", &v );
+                        //printf( "%llx %llu\n", v, v );
+                } else if ( checkB( str[1] ) ) {                                // binary constant ?
+                        v = 0;
+                        for ( unsigned int i = 2;; i += 1 ) {           // compute value
+                                if ( str[i] == '1' ) v |= 1;
+                          if ( i == last ) break;
+                                v <<= 1;
+                        } // for
                         //printf( "%llx %llu\n", v, v );
                 } else {                                                                                // octal constant