Changeset 246c245 for src/Parser

Timestamp:

May 16, 2019, 6:51:18 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8ff178d, d66e7b7

Parents:

9b4f329 (diff), 6f8e87d (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) (2 diffs)

src/Parser/ExpressionNode.cc

@@ -62 +62 @@
 static inline bool checkB( char c ) { return c == 'b' || c == 'B'; }
 static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
-static inline bool checkN( char c ) { return c == 'n' || c == 'N'; }
+// static inline bool checkN( char c ) { return c == 'n' || c == 'N'; }
 
 void lnthSuffix( string & str, int & type, int & ltype ) {
@@ -217 +217 @@
                 } else {                                                                                // explicit length, (length_type)constant
                         ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][ltype], false ), false );
-                        if ( ltype == 5 ) {                                                     // pointer, intptr( (uintptr_t)constant ) 
-                                ret = build_func( new ExpressionNode( build_varref( new string( "intptr" ) ) ), new ExpressionNode( ret ) );                                                              
+                        if ( ltype == 5 ) {                                                     // pointer, intptr( (uintptr_t)constant )
+                                ret = build_func( new ExpressionNode( build_varref( new string( "intptr" ) ) ), new ExpressionNode( ret ) );
                         } // if
                 } // if