Changes in src/AST/Convert.cpp [558d13b:aaeacf4]

File:

• src/AST/Convert.cpp (modified) (5 diffs)

src/AST/Convert.cpp

@@ -579 +579 @@
                                 tgtInferParams[srcParam.first] = ParamEntry(
                                         srcParam.second.decl,
+                                        get<Declaration>().accept1(srcParam.second.declptr),
                                         get<Type>().accept1(srcParam.second.actualType),
                                         get<Type>().accept1(srcParam.second.formalType),
@@ -2004 +2005 @@
                                 tgt[old.first] = ast::ParamEntry(
                                         old.second.decl,
+                                        getAccept1<ast::Decl>(old.second.declptr),
                                         getAccept1<ast::Type>(old.second.actualType),
                                         getAccept1<ast::Type>(old.second.formalType),
@@ -2191 +2193 @@
 
         int isStringlikeConstantType(const Type *t) {
-                const Type *referentType = nullptr;
                 if ( const ArrayType * aty = dynamic_cast< const ArrayType * >( t ) ) {
-                        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 ( const BasicType * bty = dynamic_cast< const BasicType * >( aty->base ) ) {
                            if ( bty->kind == BasicType::Kind::Char ) {
                                    return true;
@@ -2209 +2205 @@
         virtual void visit( ConstantExpr * old ) override final {
                 ast::ConstantExpr *rslt = nullptr;
-                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)) {
+                if (isIntlikeConstantType(old->result)) {
                         rslt = new ast::ConstantExpr(
                                 old->location,
@@ -2231 +2219 @@
                                 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
                         );
                 }