Changeset 31e46b8 for src/Parser/ParseNode.cc

Timestamp:

Jul 22, 2016, 2:05:52 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

ccb447e, e4957e7

Parents:

956a9c77 (diff), ef3b335 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/ParseNode.cc (modified) (4 diffs)

src/Parser/ParseNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:19:57 2016
-// Update Count     : 53
+// Last Modified On : Fri Jul 15 18:49:25 2016
+// Update Count     : 62
 // 
 
@@ -53 +53 @@
                         size_t last = value.length() - 1;                       // last character of constant
 
-                        if ( value[0] == '0' ) {                                        // octal constant ?
+                        if ( value[0] == '0' ) {                                        // octal/hex constant ?
                                 dec = false;
                                 if ( last != 0 && checkX( value[1] ) ) { // hex constant ?
                                         sscanf( (char *)value.c_str(), "%llx", &v );
                                         //printf( "%llx %llu\n", v, v );
-                                } else {
+                                } else {                                                                // octal constant
                                         sscanf( (char *)value.c_str(), "%llo", &v );
                                         //printf( "%llo %llu\n", v, v );
@@ -110 +110 @@
           case ConstantNode::Float:
                 {
+                        //long double v;
                         static const BasicType::Kind kind[2][3] = {
                                 { BasicType::Float, BasicType::Double, BasicType::LongDouble },
@@ -123 +124 @@
                                 last -= 1;                                                              // backup one character
                         } // if
+
+                        //sscanf( (char *)value.c_str(), "%Lf", &v );
+                        //printf( "%s %24.22Lf %Lf\n", value.c_str(), v, v );
+
                         if ( checkF( value[last] ) ) {                          // float ?
                                 size = 0;