Fix parser: system blocks, guidance decls, for each, block-level if, with filter, wildcard types; bump to 0.1.6

Author: henrygarner

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/allium-parser", "crates/allium"]
 
 [workspace.package]
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/juxt/allium-tools"

Cargo.toml

@@ -32,6 +32,7 @@ pub enum Decl {
     Use(UseDecl),
     ModuleDecl(ModuleDecl),
     Block(BlockDecl),
+    Guidance(GuidanceDecl),
     Default(DefaultDecl),
     Variant(VariantDecl),
     Deferred(DeferredDecl),
@@ -74,6 +75,7 @@ pub enum BlockKind {
     Rule,
     Surface,
     Actor,
+    System,
 }
 
 /// `default [Type] name = value`
@@ -101,6 +103,13 @@ pub struct DeferredDecl {
     pub path: Expr,
 }
 
+/// `guidance: value` at module level
+#[derive(Debug, Clone)]
+pub struct GuidanceDecl {
+    pub span: Span,
+    pub value: Expr,
+}
+
 /// `open question "text"`
 #[derive(Debug, Clone)]
 pub struct OpenQuestionDecl {
@@ -141,6 +150,11 @@ pub enum BlockItemKind {
         filter: Option<Expr>,
         items: Vec<BlockItem>,
     },
+    /// `if condition: ... else if ...: ... else: ...` at block level
+    IfBlock {
+        branches: Vec<CondBlockBranch>,
+        else_items: Option<Vec<BlockItem>>,
+    },
     /// `open question "text"` (nested within a block)
     OpenQuestion { text: StringLiteral },
 }
@@ -462,6 +476,14 @@ pub struct CondBranch {
     pub body: Expr,
 }
 
+/// A branch of a block-level `if`/`else if` chain.
+#[derive(Debug, Clone)]
+pub struct CondBlockBranch {
+    pub span: Span,
+    pub condition: Expr,
+    pub items: Vec<BlockItem>,
+}
+
 // ---------------------------------------------------------------------------
 // Shared types
 // ---------------------------------------------------------------------------

crates/allium-parser/src/ast.rs

@@ -33,6 +33,7 @@ pub enum TokenKind {
     Use,
     As,
     Module,
+    System,
 
     // Clause / expression keywords
     When,
@@ -126,6 +127,7 @@ impl std::fmt::Display for TokenKind {
             TokenKind::Use => write!(f, "'use'"),
             TokenKind::As => write!(f, "'as'"),
             TokenKind::Module => write!(f, "'module'"),
+            TokenKind::System => write!(f, "'system'"),
             TokenKind::When => write!(f, "'when'"),
             TokenKind::Requires => write!(f, "'requires'"),
             TokenKind::Ensures => write!(f, "'ensures'"),
@@ -206,6 +208,7 @@ impl TokenKind {
                 | TokenKind::Use
                 | TokenKind::As
                 | TokenKind::Module
+                | TokenKind::System
                 | TokenKind::When
                 | TokenKind::Requires
                 | TokenKind::Ensures
@@ -564,6 +567,7 @@ fn classify_keyword(text: &str) -> TokenKind {
         "use" => TokenKind::Use,
         "as" => TokenKind::As,
         "module" => TokenKind::Module,
+        "system" => TokenKind::System,
         "when" => TokenKind::When,
         "requires" => TokenKind::Requires,
         "ensures" => TokenKind::Ensures,