Changeset 5485e101

Timestamp:

Jun 10, 2019, 5:20:11 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

396037d

Parents:

2773ab8 (diff), 558d13b (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/AST/Convert.cpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -2191 +2191 @@
 
         int isStringlikeConstantType(const Type *t) {
+                const Type *referentType = nullptr;
                 if ( const ArrayType * aty = dynamic_cast< const ArrayType * >( t ) ) {
-                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( aty->base ) ) {
+                        referentType = aty->base;
+                } else if ( const PointerType * pty = dynamic_cast< const PointerType * >( t ) ) {
+                        referentType = pty->base;
+                }
+                if (referentType) {
+                        if ( const BasicType * bty = dynamic_cast< const BasicType * >( referentType ) ) {
                            if ( bty->kind == BasicType::Kind::Char ) {
                                    return true;
@@ -2203 +2209 @@
         virtual void visit( ConstantExpr * old ) override final {
                 ast::ConstantExpr *rslt = nullptr;
-                if (isIntlikeConstantType(old->result)) {
+                if (isStringlikeConstantType(old->result)) {
+                        rslt = new ast::ConstantExpr(
+                                old->location,
+                                GET_ACCEPT_1(result, Type),
+                                old->constant.get_value(),
+                                0,
+                                ast::ConstantExpr::Kind::String
+                        );
+                } else if (isIntlikeConstantType(old->result)) {
                         rslt = new ast::ConstantExpr(
                                 old->location,
@@ -2217 +2231 @@
                                 old->constant.get_value(),
                                 (double) old->constant.get_dval()
-                        );
-                } else if (isStringlikeConstantType(old->result)) {
-                        rslt = new ast::ConstantExpr(
-                                old->location,
-                                GET_ACCEPT_1(result, Type),
-                                old->constant.get_value(),
-                                0,
-                                ast::ConstantExpr::Kind::String
                         );
                 }