Changeset 6a1dfda for src/AST/Expr.hpp

Timestamp:

Jun 13, 2019, 8:41:11 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c36298d

Parents:

dc5072f (diff), 6896548 (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.

git-author:

Peter A. Buhr <pabuhr@…> (06/13/19 20:39:34)

git-committer:

Peter A. Buhr <pabuhr@…> (06/13/19 20:41:11)

Message:

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

File:

• src/AST/Expr.hpp (modified) (2 diffs)

src/AST/Expr.hpp

@@ -381 +381 @@
         /// generates a floating point constant of the given double
         static ConstantExpr * from_double( const CodeLocation & loc, double d );
-        /// generates an array of chars constant of the given string
-        static ConstantExpr * from_string( const CodeLocation & loc, const std::string & s );
         /// generates a null pointer value for the given type. void * if omitted.
         static ConstantExpr * null( const CodeLocation & loc, const Type * ptrType = nullptr );
@@ -693 +691 @@
         unsigned long long id;
 
-        UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i = -1 );
+        UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i = -1ull );
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }