semantic: return error on redefined constant (#4930)

Closes #4684
brimdata · Dec 8, 2023 · afba255 · afba255
1 parent cbd5bbd
commit afba255
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/compiler/semantic/scope.go b/compiler/semantic/scope.go
@@ -66,8 +66,7 @@ func (s *Scope) DefineConst(zctx *zed.Context, name string, def dag.Expr) error
 		Kind:  "Literal",
 		Value: zson.FormatValue(val),
 	}
-	s.DefineAs(name, literal)
-	return nil
+	return s.DefineAs(name, literal)
 }
 
 func (s *Scope) LookupExpr(name string) (dag.Expr, error) {

diff --git a/compiler/ztests/const-redefined-error.yaml b/compiler/ztests/const-redefined-error.yaml
@@ -0,0 +1,6 @@
+zed: |
+  type myport=int16 
+  type myport=int32 
+  put b:=type(myport)
+
+errorRE: 'symbol "myport" redefined'
diff --git a/compiler/ztests/const-redefined-scope.yaml b/compiler/ztests/const-redefined-scope.yaml
@@ -0,0 +1,11 @@
+zed: |
+  const a=1
+  (
+    const a=2
+    yield a
+  )
+
+input: 'null'
+
+output: |
+  2