Changeset b1e63ac5 for src/Parser/ExpressionNode.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

File:

• src/Parser/ExpressionNode.cc (modified) (14 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 : Thu Mar 30 17:02:46 2017
-// Update Count     : 515
+// Last Modified On : Wed Jun 28 21:08:15 2017
+// Update Count     : 542
 //
 
@@ -27 +27 @@
 #include "SynTree/Declaration.h"
 #include "Common/UnimplementedError.h"
-#include "parseutility.h"
+#include "parserutility.h"
 #include "Common/utility.h"
 
@@ -62 +62 @@
         bool dec = true, Unsigned = false;                                      // decimal, unsigned constant
         int size;                                                                                       // 0 => int, 1 => long, 2 => long long
-        unsigned long long v;                                                           // converted integral value
+        unsigned long long int v;                                                               // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
 
@@ -118 +118 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -133 +133 @@
         // floating-point constant has minimum of 2 characters: 1. or .1
         size_t last = str.length() - 1;
+        double v;
+
+        sscanf( str.c_str(), "%lg", &v );
 
         if ( checkI( str[last] ) ) {                                            // imaginary ?
@@ -150 +153 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str, v ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -156 +159 @@
 
 Expression *build_constantChar( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str, (unsigned long long int)(unsigned char)str[1] ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -164 +167 @@
         // string should probably be a primitive type
         ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
-                                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::UnsignedInt ),
-                                                                                        toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
+                                                                   new ConstantExpr( Constant::from_ulong( str.size() + 1 - 2 ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
-        ConstantExpr * ret = new ConstantExpr( Constant( at, str ) );
+        // constant 0 is ignored for pure string value
+        ConstantExpr * ret = new ConstantExpr( Constant( at, str, (unsigned long long int)0 ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -173 +176 @@
 
 Expression *build_constantZeroOne( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str ) );
+        Expression * ret = new ConstantExpr( Constant( str == "0" ? (Type *)new ZeroType( emptyQualifiers ) : (Type*)new OneType( emptyQualifiers ), str,
+                                                                                                   str == "0" ? (unsigned long long int)0 : (unsigned long long int)1 ) );
         delete &str;                                                                            // created by lex
         return ret;
@@ -184 +188 @@
         std::stringstream ss( str );
         ss >> a >> dot >> b;
-        UntypedMemberExpr * ret = new UntypedMemberExpr(
-                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( b ) ) ),
-                new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::SignedInt ), toString( a ) ) ) );
+        UntypedMemberExpr * ret = new UntypedMemberExpr( new ConstantExpr( Constant::from_int( b ) ), new ConstantExpr( Constant::from_int( a ) ) );
         delete &str;
         return ret;
@@ -207 +209 @@
 } // build_field_name_fraction_constants
 
+
+
 Expression * build_field_name_REALFRACTIONconstant( const std::string & str ) {
-        assert( str[0] == '.' );
+        if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new std::string( str.substr(1) ) );
         delete &str;
@@ -215 +219 @@
 
 Expression * build_field_name_REALDECIMALconstant( const std::string & str ) {
-        assert( str[str.size()-1] == '.' );
+        if ( str[str.size()-1] != '.' ) throw SemanticError( "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new std::string( str.substr( 0, str.size()-1 ) ) );
         delete &str;
@@ -221 +225 @@
 } // build_field_name_REALDECIMALconstant
 
-NameExpr * build_varref( const string *name, bool labelp ) {
+NameExpr * build_varref( const string *name ) {
         NameExpr *expr = new NameExpr( *name, nullptr );
         delete name;
@@ -344 +348 @@
 
 Expression *build_valexpr( StatementNode *s ) {
-        return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+        return new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(s) ) );
 }
 Expression *build_typevalue( DeclarationNode *decl ) {