feat(codegen): implement bitwise NOT and constant folding; fix .as legacy refs (#25)

hyperpolymath · web-flow · commit 5d79e9e35174 · 2026-04-17T22:07:25.000+01:00
diff --git a/.build/justfile b/.build/justfile
@@ -52,10 +52,10 @@ golden-path:
     dune build
     @echo "2. Running tests..."
     dune runtest
-    @echo "3. Testing lexer on hello.as..."
-    dune exec affinescript -- lex examples/hello.as
-    @echo "4. Testing parser on ownership.as..."
-    dune exec affinescript -- parse examples/ownership.as
+    @echo "3. Testing lexer on hello.affine..."
+    dune exec affinescript -- lex examples/hello.affine
+    @echo "4. Testing parser on ownership.affine..."
+    dune exec affinescript -- parse examples/ownership.affine
     @echo "=== Golden Path Complete ==="
 
 # Prepare a release
diff --git a/conformance/invalid/001_unclosed_brace.expected b/conformance/invalid/001_unclosed_brace.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: unexpected end of file or missing '}'
 error[E0002]: Parse error: unexpected end of input
-  --> conformance/invalid/001_unclosed_brace.as:5:1
+  --> conformance/invalid/001_unclosed_brace.affine:5:1
    |
  5 | // Missing closing brace
    | ^ expected '}'
diff --git a/conformance/invalid/002_unclosed_string.expected b/conformance/invalid/002_unclosed_string.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: unterminated string literal
 error[E0001]: Lexical error: unterminated string literal
-  --> conformance/invalid/002_unclosed_string.as:4:11
+  --> conformance/invalid/002_unclosed_string.affine:4:11
    |
  4 |   let s = "hello world
    |           ^ string literal not closed
diff --git a/conformance/invalid/003_bad_number.expected b/conformance/invalid/003_bad_number.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: invalid hexadecimal literal
 error[E0001]: Lexical error: invalid hexadecimal literal
-  --> conformance/invalid/003_bad_number.as:4:11
+  --> conformance/invalid/003_bad_number.affine:4:11
    |
  4 |   let x = 0xGHI;
    |           ^^^^^ invalid hex digit 'G'
diff --git a/conformance/invalid/004_unexpected_token.expected b/conformance/invalid/004_unexpected_token.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: expected identifier
 error[E0002]: Parse error: expected identifier
-  --> conformance/invalid/004_unexpected_token.as:4:7
+  --> conformance/invalid/004_unexpected_token.affine:4:7
    |
  4 |   let = 42;
    |       ^ expected identifier, found '='
diff --git a/conformance/invalid/005_missing_arrow.expected b/conformance/invalid/005_missing_arrow.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: expected '->'
 error[E0002]: Parse error: expected '->'
-  --> conformance/invalid/005_missing_arrow.as:3:10
+  --> conformance/invalid/005_missing_arrow.affine:3:10
    |
  3 | fn test() Int {
    |          ^ expected '->', found identifier
diff --git a/conformance/invalid/006_bad_operator.expected b/conformance/invalid/006_bad_operator.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: unknown operator or unexpected character
 error[E0001]: Lexical error: unexpected character
-  --> conformance/invalid/006_bad_operator.as:4:15
+  --> conformance/invalid/006_bad_operator.affine:4:15
    |
  4 |   let x = 1 @@ 2;
    |               ^ unexpected '@'
diff --git a/conformance/invalid/007_incomplete_effect.expected b/conformance/invalid/007_incomplete_effect.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: unexpected end of file or missing '}'
 error[E0002]: Parse error: unexpected end of input
-  --> conformance/invalid/007_incomplete_effect.as:4:28
+  --> conformance/invalid/007_incomplete_effect.affine:4:28
    |
  4 |   fn missing_return_type();
    |                            ^ expected '}', found end of file
diff --git a/conformance/invalid/008_mismatched_parens.expected b/conformance/invalid/008_mismatched_parens.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: expected ')'
 error[E0002]: Parse error: expected ')'
-  --> conformance/invalid/008_mismatched_parens.as:4:16
+  --> conformance/invalid/008_mismatched_parens.affine:4:16
    |
  4 |   let x = (1 + 2;
    |                ^ expected ')', found ';'
diff --git a/conformance/invalid/009_reserved_keyword.expected b/conformance/invalid/009_reserved_keyword.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: expected identifier, found keyword
 error[E0002]: Parse error: expected identifier
-  --> conformance/invalid/009_reserved_keyword.as:4:7
+  --> conformance/invalid/009_reserved_keyword.affine:4:7
    |
  4 |   let fn = 42;
    |       ^^ expected identifier, found keyword 'fn'
diff --git a/conformance/invalid/010_empty_match.expected b/conformance/invalid/010_empty_match.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: expected at least one match arm
 error[E0002]: Parse error: expected pattern
-  --> conformance/invalid/010_empty_match.as:5:3
+  --> conformance/invalid/010_empty_match.affine:5:3
    |
  5 |   }
    | ^ match expression requires at least one arm
diff --git a/conformance/invalid/011_bad_escape.expected b/conformance/invalid/011_bad_escape.expected
@@ -2,7 +2,7 @@
 # Exit code: 1
 # Error pattern: invalid escape sequence
 error[E0001]: Lexical error: invalid escape sequence '\q'
-  --> conformance/invalid/011_bad_escape.as:4:16
+  --> conformance/invalid/011_bad_escape.affine:4:16
    |
  4 |   let s = "bad \q escape";
    |                ^^ unknown escape sequence
diff --git a/docs/guides/frontier-programming-practices/AI.a2ml b/docs/guides/frontier-programming-practices/AI.a2ml
@@ -68,7 +68,7 @@
     (compile-target
       (primary "typed-wasm")
       (secondary "julia")
-      (rule "AffineScript is a compiled language. Its semantics live in .as source and compiled output. Do not rewrite .as source in another language as a shortcut for refactoring, modularization, or 'improvement'."))
+      (rule "AffineScript is a compiled language. Its semantics live in .affine source and compiled output. Do not rewrite .affine source in another language as a shortcut for refactoring, modularization, or 'improvement'."))
 
     (modularization
       (rule "When asked to modularize or clean up code, operate within AffineScript using the module system, record decomposition (row polymorphism), and phantom type parameters. Do not create new compiler features to solve user-code modularization problems."))
diff --git a/justfile b/justfile
@@ -89,9 +89,9 @@ golden-path:
     @echo "2. Running tests..."
     dune runtest
     @echo "3. Lexer smoke test..."
-    dune exec affinescript -- lex examples/hello.affine 2>/dev/null || dune exec affinescript -- lex examples/hello.as 2>/dev/null || echo "(no example file — skip)"
+    dune exec affinescript -- lex examples/hello.affine 2>/dev/null || dune exec affinescript -- lex examples/hello.affine 2>/dev/null || echo "(no example file — skip)"
     @echo "4. Ownership smoke test..."
-    dune exec affinescript -- parse examples/ownership.affine 2>/dev/null || dune exec affinescript -- parse examples/ownership.as 2>/dev/null || echo "(no ownership example — skip)"
+    dune exec affinescript -- parse examples/ownership.affine 2>/dev/null || dune exec affinescript -- parse examples/ownership.affine 2>/dev/null || echo "(no ownership example — skip)"
     @echo "=== Golden Path Complete ==="
 
 # Run panic-attack security scan
diff --git a/lib/codegen.ml b/lib/codegen.ml
@@ -385,7 +385,7 @@ let gen_unop (op : unary_op) : instr result =
   match op with
   | OpNeg -> Ok I32Sub  (* 0 - x *)
   | OpNot -> Ok I32Eqz  (* x == 0 *)
-  | OpBitNot -> Error (UnsupportedFeature "Bitwise NOT")
+  | OpBitNot -> Ok I32Xor (* -1 ^ x *)
   | OpRef -> Error (UnsupportedFeature "OpRef handled in ExprUnary")
   | OpDeref -> Error (UnsupportedFeature "OpDeref handled in ExprUnary")
 
diff --git a/lib/codegen_gc.ml b/lib/codegen_gc.ml
@@ -334,8 +334,12 @@ let rec gen_gc_expr (ctx : gc_ctx) (expr : expr) : (gc_ctx * gc_instr list) cg_r
     let* (ctx', code) = gen_gc_expr ctx operand in
     Ok (ctx', code @ [std Wasm.I32Eqz])
 
-  | ExprUnary (_, operand) ->
-    gen_gc_expr ctx operand
+  | ExprUnary (OpBitNot, operand) ->
+    let* (ctx', code) = gen_gc_expr ctx operand in
+    Ok (ctx', [push_i32 (-1)] @ code @ [std Wasm.I32Xor])
+
+  | ExprUnary (op, _operand) ->
+    Error (UnsupportedFeature (Printf.sprintf "Unary operator %s" (show_unary_op op)))
 
   (* ── Function calls ────────────────────────────────────────────── *)
 
diff --git a/lib/opt.ml b/lib/opt.ml
@@ -26,6 +26,11 @@ let rec fold_constants_expr (expr : expr) : expr =
       | OpLe -> ExprLit (LitBool (a <= b, Span.dummy))
       | OpGt -> ExprLit (LitBool (a > b, Span.dummy))
       | OpGe -> ExprLit (LitBool (a >= b, Span.dummy))
+      | OpBitAnd -> ExprLit (LitInt (a land b, Span.dummy))
+      | OpBitOr -> ExprLit (LitInt (a lor b, Span.dummy))
+      | OpBitXor -> ExprLit (LitInt (a lxor b, Span.dummy))
+      | OpShl -> ExprLit (LitInt (a lsl b, Span.dummy))
+      | OpShr -> ExprLit (LitInt (a lsr b, Span.dummy))
       | _ -> expr  (* Don't fold other ops or division by zero *)
     end
 
@@ -45,6 +50,9 @@ let rec fold_constants_expr (expr : expr) : expr =
   | ExprUnary (OpNot, ExprLit (LitBool (b, _))) ->
     ExprLit (LitBool (not b, Span.dummy))
 
+  | ExprUnary (OpBitNot, ExprLit (LitInt (n, _))) ->
+    ExprLit (LitInt (lnot n, Span.dummy))
+
   | ExprBinary (left, op, right) ->
     let left' = fold_constants_expr left in
     let right' = fold_constants_expr right in
diff --git a/test/e2e/fixtures/bitwise.affine b/test/e2e/fixtures/bitwise.affine
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: PMPL-1.0-or-later
+// End-to-end test: bitwise operations
+// Tests: parsing, constant folding, WASM codegen, Julia codegen
+
+fn bit_and(a: Int, b: Int) -> Int = a & b;
+fn bit_or(a: Int, b: Int) -> Int = a | b;
+fn bit_xor(a: Int, b: Int) -> Int = a ^ b;
+fn bit_not(n: Int) -> Int = ~n;
+fn bit_shl(a: Int, b: Int) -> Int = a << b;
+fn bit_shr(a: Int, b: Int) -> Int = a >> b;
+
+fn constant_fold_bitwise() -> Int {
+  (1 & 3) | (4 ^ 6) | (~(-1))
+}
diff --git a/test/golden/binary_ops.affine b/test/golden/binary_ops.affine
@@ -6,3 +6,11 @@ fn test_ops() -> Int {
 fn test_compare() -> Bool {
   x == y && a < b
 }
+
+fn test_bitwise(a: Int, b: Int) -> Int {
+  (a & b | a ^ b) << 2 >> 1
+}
+
+fn test_bitwise_not(n: Int) -> Int {
+  ~n
+}
diff --git a/test/golden/binary_ops.expected b/test/golden/binary_ops.expected
diff --git a/test/test_e2e.ml b/test/test_e2e.ml
diff --git a/tests/codegen/README.md b/tests/codegen/README.md

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: unexpected end of file or missing '}'`
`4`	`4`	`error[E0002]: Parse error: unexpected end of input`
`5`		`- --> conformance/invalid/001_unclosed_brace.as:5:1`
	`5`	`+ --> conformance/invalid/001_unclosed_brace.affine:5:1`
`6`	`6`	`\|`
`7`	`7`	`5 \| // Missing closing brace`
`8`	`8`	`\| ^ expected '}'`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: unterminated string literal`
`4`	`4`	`error[E0001]: Lexical error: unterminated string literal`
`5`		`- --> conformance/invalid/002_unclosed_string.as:4:11`
	`5`	`+ --> conformance/invalid/002_unclosed_string.affine:4:11`
`6`	`6`	`\|`
`7`	`7`	`4 \| let s = "hello world`
`8`	`8`	`\| ^ string literal not closed`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: invalid hexadecimal literal`
`4`	`4`	`error[E0001]: Lexical error: invalid hexadecimal literal`
`5`		`- --> conformance/invalid/003_bad_number.as:4:11`
	`5`	`+ --> conformance/invalid/003_bad_number.affine:4:11`
`6`	`6`	`\|`
`7`	`7`	`4 \| let x = 0xGHI;`
`8`	`8`	`\| ^^^^^ invalid hex digit 'G'`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: expected identifier`
`4`	`4`	`error[E0002]: Parse error: expected identifier`
`5`		`- --> conformance/invalid/004_unexpected_token.as:4:7`
	`5`	`+ --> conformance/invalid/004_unexpected_token.affine:4:7`
`6`	`6`	`\|`
`7`	`7`	`4 \| let = 42;`
`8`	`8`	`\| ^ expected identifier, found '='`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: expected '->'`
`4`	`4`	`error[E0002]: Parse error: expected '->'`
`5`		`- --> conformance/invalid/005_missing_arrow.as:3:10`
	`5`	`+ --> conformance/invalid/005_missing_arrow.affine:3:10`
`6`	`6`	`\|`
`7`	`7`	`3 \| fn test() Int {`
`8`	`8`	`\| ^ expected '->', found identifier`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: unknown operator or unexpected character`
`4`	`4`	`error[E0001]: Lexical error: unexpected character`
`5`		`- --> conformance/invalid/006_bad_operator.as:4:15`
	`5`	`+ --> conformance/invalid/006_bad_operator.affine:4:15`
`6`	`6`	`\|`
`7`	`7`	`4 \| let x = 1 @@ 2;`
`8`	`8`	`\| ^ unexpected '@'`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: expected ')'`
`4`	`4`	`error[E0002]: Parse error: expected ')'`
`5`		`- --> conformance/invalid/008_mismatched_parens.as:4:16`
	`5`	`+ --> conformance/invalid/008_mismatched_parens.affine:4:16`
`6`	`6`	`\|`
`7`	`7`	`4 \| let x = (1 + 2;`
`8`	`8`	`\| ^ expected ')', found ';'`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Exit code: 1`
`3`	`3`	`# Error pattern: expected identifier, found keyword`
`4`	`4`	`error[E0002]: Parse error: expected identifier`
`5`		`- --> conformance/invalid/009_reserved_keyword.as:4:7`
	`5`	`+ --> conformance/invalid/009_reserved_keyword.affine:4:7`
`6`	`6`	`\|`
`7`	`7`	`4 \| let fn = 42;`
`8`	`8`	`\| ^^ expected identifier, found keyword 'fn'`