Codegen: proper stubs for literal patterns

nois-lang · Apr 20, 2024 · 42d9858 · 42d9858
1 parent a1c8cad
commit 42d9858
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/src/codegen/js/expr.ts b/src/codegen/js/expr.ts
@@ -477,7 +477,7 @@ export const emitPattern = (pattern: Pattern, ctx: Context, assignVar: string, p
         case 'float-literal':
         case 'bool-literal':
         case 'identifier':
-            return jsError(pattern.expr.kind)
+            return emitToken(`${jsError(pattern.expr.kind).value};`)
         case 'hole':
             return emitToken('')
         default:

diff --git a/src/codegen/js/node.ts b/src/codegen/js/node.ts
@@ -50,7 +50,8 @@ export const jsVariable = (name: string, emit?: EmitNode, pub = false): EmitNode
 }
 
 export const jsError = (message?: string): EmitToken => {
-    return emitToken(`(() => { throw Error(${jsString(message ?? '')}); })()`)
+    const msg = `codegen error: ${message ?? ''}`
+    return emitToken(`(() => { throw Error(${jsString(msg)}); })()`)
 }
 
 export const emitIntersperse = (

diff --git a/src/semantic/exhaust.ts b/src/semantic/exhaust.ts
@@ -93,6 +93,12 @@ const matchPattern = (pattern: PatternExpr, tree: MatchTree, ctx: Context): bool
         case 'string-literal':
         case 'char-literal':
         case 'unary-expr':
+        case 'string-interpolated':
+        case 'int-literal':
+        case 'float-literal':
+        case 'bool-literal':
+        case 'identifier':
+        case 'list-pattern':
         case 'operand-expr':
             // match the node
             return true

diff --git a/src/semantic/match.ts b/src/semantic/match.ts
@@ -35,14 +35,6 @@ export const checkPattern = (
             // TODO: typed hole reporting, Haskell style: https://wiki.haskell.org/GHC/Typed_holes
             expr.type = expectedType
             break
-        case 'operand-expr':
-            if (!refutable) {
-                addError(ctx, unexpectedRefutablePatternError(ctx, pattern.expr))
-                break
-            }
-            checkOperand(expr.operand, ctx)
-            expr.type = expr.operand.type
-            break
         case 'list-pattern':
             if (!refutable) {
                 addError(ctx, unexpectedRefutablePatternError(ctx, pattern.expr))
@@ -63,8 +55,18 @@ export const checkPattern = (
             })
             expr.type ??= unknownType
             break
+        case 'int-literal':
+        case 'float-literal':
+        case 'string-literal':
+        case 'bool-literal':
+            if (!refutable) {
+                addError(ctx, unexpectedRefutablePatternError(ctx, pattern.expr))
+                break
+            }
+            checkOperand(expr, ctx)
+            break
         default:
-            unreachable()
+            unreachable(expr.kind)
     }
 
     if (pattern.name) {
@@ -73,10 +75,8 @@ export const checkPattern = (
         scope.definitions.set(defKey(nameDef), nameDef)
     }
 
-    if (expectedType.kind !== 'malleable-type') {
-        if (!isAssignable(expectedType, expr.type!, ctx)) {
-            addError(ctx, typeError(ctx, pattern.expr, expr.type!, expectedType))
-        }
+    if (!isAssignable(expectedType, expr.type!, ctx)) {
+        addError(ctx, typeError(ctx, pattern.expr, expr.type!, expectedType))
     }
 }