Merge Layer 1 local work into main#39
Closed
hyperpolymath wants to merge 11 commits into
Closed
Conversation
…directives Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Merged features from docs/grammar.ebnf (most complete) into spec/grammar.ebnf as the single canonical grammar: - Added Result type patterns (Okay/Oops) and constructor patterns - Added guard expressions in pattern matching - Added full concurrency primitives (send, receive, await, cancel) - Added module export (share statement) - Added Result and generic types - Added postfix operators (try ?, index [], unit annotation) - Added result constructors (Okay/Oops) and unwrap - Added SPDX header and canonical marker Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Consent-extended Hoare logic covering: consent gates (grant/deny/cached), worker isolation, channel safety, error handling (attempt/reassure), Result types (Okay/Oops), pragma modes, and gratitude preservation. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Covers all WokeLang AST nodes including consent-specific constructs: - TopLevelItem (10 variants: Function, ConsentBlock, Worker, SideQuest, etc.) - Statement (15 variants: VarDecl, Conditional, Loop, While, AttemptBlock, etc.) - Expr (16 variants: Binary, Call, Lambda, Okay/Oops/Unwrap, FieldAccess, etc.) - Pattern matching (Decide with match arms) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
New valid tests: hello world, consent blocks, gratitude, variables, conditionals, loops, attempt/reassure, complain, worker spawn, pattern matching, unit measurements, emote annotations, nested consent, return values, arrays, Result types. New invalid tests: missing semicolons, unclosed blocks, bad consent syntax, unknown keywords, empty functions, missing reassurance, bad repeat syntax, unclosed strings, nested functions, various edge cases. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Add --output sexpr|json flags to the parse subcommand, covering all WokeLang AST node types: TopLevelItem, Statement, Expr, Pattern, Type. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Includes Layer 1 S-expr dump, conformance tests, AST visitor, seam audit fixes, and system specifications from local session. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
hyperpolymath
added a commit
that referenced
this pull request
Mar 21, 2026
Brings all source code, specs, tests, conformance suite, and documentation from layer1-local-work branch onto the RSR-restructured main. Key additions: - S-expression and JSON AST dump support (src/sexpr.rs, main.rs --format flags) - AST visitor framework (src/ast/visitor.rs) - 25+ conformance tests (38 total) - Complete Rust implementation (lexer, parser, interpreter, VM, LSP, REPL) - OCaml reference implementation (core/) - Formal specs (axiomatic semantics, memory model, concurrency, effects) - WASM compiler target - Reconciled grammar (spec/grammar.ebnf) Resolves PR #39 diverged history by selectively applying content onto current origin/main infrastructure. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Owner
Author
|
Resolved by direct merge onto main (commit 5272220). Layer 1 S-expr changes and all source code now on main. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Context
Local branch diverged from main (10 ahead, 23 behind). Rebase had too many conflicts due to structural reorganization on both sides. This PR allows manual merge review.
Test plan
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com