From 3e89092833a6d407e711fe4ae5f44474ff34cf64 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Tue, 1 Jan 2019 17:15:51 -0800
Subject: Some changes to the error API, a fix for statement block parsing, and
 replacing ((foo 1 baz)'s meaning) with $(foo 1 baz).

---
 core/control_flow.nom | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'core/control_flow.nom')

diff --git a/core/control_flow.nom b/core/control_flow.nom
index f066767..5c90bcc 100644
--- a/core/control_flow.nom
+++ b/core/control_flow.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file contains compile-time actions that define basic control flow structures
     like "if" statements and loops.
@@ -16,7 +16,7 @@ test:
 # Conditionals
 test:
     if (no):
-        barf "conditional fail"
+        fail "conditional fail"
 
 (if $condition $if_body) compiles to ("
     if \($condition as lua expr) then
@@ -26,7 +26,7 @@ test:
 
 test:
     unless (yes):
-        barf "conditional fail"
+        fail "conditional fail"
 
 (unless $condition $unless_body) parses as (if (not $condition) $unless_body)
 [
@@ -134,7 +134,7 @@ test:
         $x += 1
         if (yes):
             do next
-        barf "Failed to 'do next'"
+        fail "Failed to 'do next'"
     assume ($x == 20)
 
 (repeat while $condition $body) compiles to:
@@ -311,16 +311,16 @@ test:
 test:
     when:
         (1 == 2) (100 < 0):
-            barf "bad conditional"
+            fail "bad conditional"
         (1 == 0) (1 == 1) $not_a_variable.x: do nothing
         (1 == 1):
-            barf "bad conditional"
+            fail "bad conditional"
         
         (1 == 2):
-            barf "bad conditional"
+            fail "bad conditional"
         
         else:
-            barf "bad conditional"
+            fail "bad conditional"
 
 # Multi-branch conditional (if..elseif..else)
 (when $body) compiles to:
@@ -374,16 +374,16 @@ test:
 test:
     if 5 is:
         1 2 3:
-            barf "bad switch statement"
+            fail "bad switch statement"
         
         4 5:
             do nothing
         
         5 6:
-            barf "bad switch statement"
+            fail "bad switch statement"
         
         else:
-            barf "bad switch statement"
+            fail "bad switch statement"
 
 # Switch statement
 [if $branch_value is $body, when $branch_value is $body] all compile to:
-- 
cgit v1.2.3