(feat) Add String Interpolation to AssemblyScript near/near-sdk-as#201

Author: developerfred

src/ast.ts

@@ -376,10 +376,7 @@ export abstract class Node {
     value: string,
     range: Range
   ): StringLiteralExpression {
-    var expr = new StringLiteralExpression();
-    expr.range = range;
-    expr.value = value;
-    return expr;
+    return new TemplateLiteralExpression(value, range);
   }
 
   static createSuperExpression(
@@ -1443,12 +1440,16 @@ export class StringLiteralExpression extends LiteralExpression {
   }
 }
 
-/** Represents a string template literal expression. */
+/** Represents a string literal expression. */
 export class TemplateLiteralExpression extends LiteralExpression {
-  literalKind = LiteralKind.TEMPLATE;
-
-  /** String value without quotes. */
-  value: string;
+  constructor(
+    /** String value without quotes. */
+    public expresssionParts: Expression[],
+    /** Source range. */
+    range: Range
+  ) {
+    super(LiteralKind.TEMPLATE, range);
+  }
 }
 
 /** Represents a `super` expression. */

src/compiler.ts

@@ -8780,9 +8780,9 @@ export class Compiler extends DiagnosticEmitter {
     return module.unreachable();
   }
 
-  compileTemplateLiteral(arg0: TemplateLiteralExpression, constraints: Constraints): ExpressionRef {
-    const innerExpressions: ExpressionRef[] = [];
-
+  compileTemplateLiteral(expr: TemplateLiteralExpression, constraints: Constraints): ExpressionRef {
+    const innerExpressions: ExpressionRef[] = expr.expressionParts;
+    
     return 0;
   }
 

src/tokenizer.ts

@@ -560,12 +560,8 @@ export class Tokenizer extends DiagnosticEmitter {
           return Token.STRINGLITERAL;
         }
         case CharCode.BACKTICK: { // TODO
-<<<<<<< HEAD
-          return Token.TEMPLATELITERAL; // expects a call to readString
-=======
           this.pos = pos;
           return Token.STRINGLITERAL; // expects a call to readString
->>>>>>> upstream/master
         }
         case CharCode.PERCENT: {
           ++pos;
@@ -1086,11 +1082,6 @@ export class Tokenizer extends DiagnosticEmitter {
 
   readString(quote: i32 = -1): string {
     var text = this.source.text;
-<<<<<<< HEAD
-    quote = quote == -1 ? text.charCodeAt(this.pos++) : quote;
-    var start = this.pos;
-=======
->>>>>>> upstream/master
     var end = this.end;
     var pos = this.pos;
     var quote = text.charCodeAt(pos++);
@@ -1105,15 +1096,7 @@ export class Tokenizer extends DiagnosticEmitter {
         );
         break;
       }
-<<<<<<< HEAD
-      let c = text.charCodeAt(this.pos);
-      if (quote == CharCode.BACKTICK && c == CharCode.DOLLAR) {
-        result += text.substring(start, this.pos);
-        break;
-      }
-=======
       let c = text.charCodeAt(pos);
->>>>>>> upstream/master
       if (c == quote) {
         result += text.substring(start, pos++);
         break;