Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deduplicated goto label syntax (now just use (--- (label) ---))

Browse Source
This commit is contained in:
Bruce Hill 2018-11-19 17:44:46 -08:00
parent a89d69e843
commit f304138530
5 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility/4.10.12.7.nom
View File

@ -60,7 +60,7 @@ upgrade %tree to "4.10.12.7" as:
go to (insert chunk)
%i += 1
return
=== (insert chunk) ===
--- (insert chunk) ---
[%chunk1, %chunk2] = [..]
SyntaxTree {type: "Block", source: %first_chunk.source}
SyntaxTree {type: "Block", source: %first_chunk.source}

5
compatibility/4.11.nom
View File

@ -38,6 +38,11 @@ upgrade action (line %n in %text) to "4.11" as (%text::line %n)
upgrade action (line number of %pos in %text) to "4.11" as (..)
%text::line number at %pos
# Deduplicating goto labels:
upgrade action [=== %label ===, *** %label ***] to "4.11" as (--- %label ---)
upgrade action [===stop %label ===, ***stop %label ***] to "4.11" as (---stop %label ---)
upgrade action [===next %label ===, ***next %label ***] to "4.11" as (---next %label ---)
# Deprecating shorthand functions:
upgrade action [if all of %items %body, if all of %items then %body] to "4.11" as (..)
if (all of %items) %body

34
core/control_flow.nom
View File

@ -75,18 +75,18 @@ test:
# GOTOs
test:
%i = 0
=== %loop ===
--- %loop ---
%i += 1
unless (%i == 10):
go to %loop
assume (%i == 10)
=== (Loop) ===
--- (Loop) ---
%i -= 1
unless (%i == 0):
go to (Loop)
assume (%i == 0)
[=== %label ===, --- %label ---, *** %label ***] all compile to "\
(--- %label ---) compiles to "\
..::label_\((%label.stub if (%label.type == "Action") else %label) as lua identifier)::"
(go to %label) compiles to "\
@ -105,10 +105,10 @@ test:
..else:
return (Lua "goto continue")
[===stop %var ===, ---stop %var ---, ***stop %var ***] all compile to "\
(---stop %var ---) compiles to "\
..::stop_\((%var.stub if (%var.type == "action") else %var) as lua identifier)::"
[===next %var ===, ---next %var ---, ***next %var ***] all compile to "\
(---next %var ---) compiles to "\
..::continue_\((%var.stub if (%var.type == "action") else %var) as lua identifier)::"
# While loops
@ -214,14 +214,14 @@ test:
%lua::append "\n ::continue::"
if (%body has subtree \(do next %var)):
%lua::append "\n " (what (===next %var ===) compiles to)
%lua::append "\n " (what (---next %var ---) compiles to)
%lua::append "\nend --numeric for-loop"
if (%body has subtree \(stop %var)):
%inner_lua = %lua
%lua = (Lua "do -- scope for stopping for-loop\n ")
%lua::append %inner_lua "\n "
%lua::append (what (===stop %var ===) compiles to)
%lua::append (what (---stop %var ---) compiles to)
%lua::append "\nend -- end of scope for stopping for-loop"
return %lua
@ -261,14 +261,14 @@ test:
%lua::append "\n ::continue::"
if (%body has subtree \(do next %var)):
%lua::append "\n " (what (===next %var ===) compiles to)
%lua::append "\n " (what (---next %var ---) compiles to)
%lua::append "\nend --foreach-loop"
if (%body has subtree \(stop %var)):
%inner_lua = %lua
%lua = (Lua "do -- scope for stopping for-loop\n ")
%lua::append %inner_lua "\n "
%lua::append (what (===stop %var ===) compiles to)
%lua::append (what (---stop %var ---) compiles to)
%lua::append "\nend -- end of scope for stopping for-loop"
return %lua
@ -284,14 +284,14 @@ test:
%lua::append "\n ::continue::"
if (%body has subtree \(do next %var)):
%lua::append "\n " (what (===next %var ===) compiles to)
%lua::append "\n " (what (---next %var ---) compiles to)
%lua::append "\nend --foreach-loop"
if (%body has subtree \(stop %var)):
%inner_lua = %lua
%lua = (Lua "do -- scope for stopping for-loop\n ")
%lua::append %inner_lua "\n "
%lua::append (what (===stop %var ===) compiles to)
%lua::append (what (---stop %var ---) compiles to)
%lua::append "\nend -- end of scope for stopping for-loop"
return %lua
@ -324,18 +324,18 @@ test:
%lua::append "\n ::continue::"
if (%body has subtree \(do next %key)):
%lua::append "\n " (what (===next %key ===) compiles to)
%lua::append "\n " (what (---next %key ---) compiles to)
if (%body has subtree \(do next %value)):
%lua::append "\n " (what (===next %value ===) compiles to)
%lua::append "\n " (what (---next %value ---) compiles to)
%lua::append "\nend --foreach-loop"
%stop_labels = (Lua "")
if (%body has subtree \(stop %key)):
%stop_labels::append "\n" (what (===stop %key ===) compiles to)
%stop_labels::append "\n" (what (---stop %key ---) compiles to)
if (%body has subtree \(stop %value)):
%stop_labels::append "\n" (what (===stop %value ===) compiles to)
%stop_labels::append "\n" (what (---stop %value ---) compiles to)
if ((size of "\%stop_labels") > 0):
%inner_lua = %lua
@ -537,10 +537,10 @@ test:
%lua::append "\n ::continue::"
if (%body has subtree \(do next %var)):
%lua::append "\n \(what (===next %var ===) compiles to)"
%lua::append "\n \(what (---next %var ---) compiles to)"
%lua::append "\n end -- Recursive loop"
if (%body has subtree \(stop %var)):
%lua::append "\n \(what (===stop %var ===) compiles to)"
%lua::append "\n \(what (---stop %var ---) compiles to)"
%lua::append "\nend -- Recursive scope"
return %lua

4
examples/how_do_i.nom
View File

@ -65,7 +65,7 @@ say "\
Similarly, you can put a long interpolated indented value like: \(..)
1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9
.. between a backslash and two periods."
say "Single-line text can contain escape sequences like \", \\, \000, and \n"
# How do I define a list?
@ -172,7 +172,7 @@ repeat:
# How do I do a 'goto'?
do:
%x = 1
=== (my loop) ===
--- (my loop) ---
say "GOTO loop #\%x"
%x += 1
if (%x <= 3):

2
tools/repl.nom
View File

@ -34,7 +34,7 @@ repeat:
go to (run buffer)
%buff::add (%line::with "\t" -> " ")
say (dim (yellow ".. ")) inline
=== (run buffer) ===
--- (run buffer) ---
if ((size of %buff) == 0): stop
%buff = (%buff::joined)