sema: fix binary constant eval

julelang · Mar 10, 2024 · a1f7689 · a1f7689
1 parent 4ba3520
commit a1f7689
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/std/jule/sema/eval.jule b/std/jule/sema/eval.jule
@@ -4101,10 +4101,14 @@ impl BinaryEval {
             d.model = d.constant
             ret
         }
-        if self.l.constant == self.l.model && self.r.constant != self.r.model {
-            // Right constant is not pure, use type r's type.
-            d.kind = self.r.kind
+        if self.op.kind != TokenKind.Lshift && self.op.kind != TokenKind.Rshift {
+            if self.l.constant == self.l.model && self.r.constant != self.r.model {
+                // Right constant is not pure, use type r's type.
+                d.kind = self.r.kind
+                prim = d.kind.prim()
+            }
         }
+        fit_bitsize(d)
         cast_const_by_type(prim.kind, d)
     }
 

diff --git a/std/jule/sema/scope.jule b/std/jule/sema/scope.jule
@@ -1195,6 +1195,7 @@ impl ScopeChecker {
         } else {
             self.s.eval(self)
         }
+        eval.unsafety = self.is_unsafe()
         let mut r = eval.eval_expr(a.right)
         if r == nil {
             ret
@@ -1238,11 +1239,7 @@ impl ScopeChecker {
             }
 
             a.setter.kind = a.setter.kind[:a.setter.kind.len-1]
-            let mut solver = BinaryEval.new(&Eval{
-                s:        self.s,
-                lookup:   self,
-                unsafety: self.is_unsafe(),
-            }, a.setter)
+            let mut solver = BinaryEval.new(eval, a.setter)
             r = solver.solve_explicit(l, r)
             if r == nil {
                 ret