Codegen: string interpolation

nois-lang · Mar 22, 2024 · 048d232 · 048d232
1 parent 9dcdb74
commit 048d232
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/codegen/js/expr.ts b/src/codegen/js/expr.ts
@@ -7,7 +7,7 @@ import { Context } from '../../scope'
 import { relTypeName } from '../../scope/trait'
 import { operatorImplMap } from '../../semantic/op'
 import { ConcreteGeneric } from '../../typecheck'
-import { todo, unreachable } from '../../util/todo'
+import { unreachable } from '../../util/todo'
 import { EmitNode, emitIntersperse, emitToken, emitTree, jsError, jsVariable } from './node'
 import { emitBlock, emitBlockStatements } from './statement'
 
@@ -270,7 +270,22 @@ export const emitOperand = (operand: Operand, module: Module, ctx: Context): Emi
         case 'bool-literal':
             return emitLiteral(operand, module, ctx, resultVar)
         case 'string-interpolated':
-            return todo('string interpolation')
+            const ts: EmitExpr[] = operand.tokens.map(t => {
+                if (typeof t === 'string') {
+                    return { emit: emitToken(''), resultVar: `"${t}"` }
+                } else {
+                    const exprEmit = emitExpr(t, module, ctx)
+                    return {
+                        emit: exprEmit.emit,
+                        resultVar: extractValue(`${exprEmit.resultVar}.Show().show(${exprEmit.resultVar})`)
+                    }
+                }
+            })
+            const concatEmit = jsVariable(
+                resultVar,
+                emitTree([emitToken('String.String('), emitToken(ts.map(t => t.resultVar).join('+')), emitToken(')')])
+            )
+            return { emit: emitTree([...ts.map(t => t.emit), concatEmit]), resultVar }
         case 'identifier': {
             if (operand.ref?.def.kind === 'method-def') {
                 if (operand.ref.def.fn.static === true) {

diff --git a/src/semantic/expr.ts b/src/semantic/expr.ts
@@ -105,6 +105,7 @@ export const checkOperand = (operand: Operand, ctx: Context): void => {
             for (const t of operand.tokens) {
                 if (typeof t !== 'string') {
                     checkExpr(t, ctx)
+                    upcast(t, t.type!, show, ctx)
                     const type = extractConcreteSupertype(t.type!, show.identifier, ctx)
                     if (!type) {
                         addError(ctx, typeError(ctx, t, t.type!, show))

diff --git a/src/std/list.no b/src/std/list.no
@@ -33,7 +33,7 @@ impl <T> Collector<T> for List<T> {
 
 impl Show for List<String> {
     fn show(self): String {
-        "[".concat(self.iter().intersperse(", ").collect<String>()).concat("]")
+        "[{self.iter().intersperse(", ").collect<String>()}]"
     }
 }