From 5027bd4f0f2c6dcebf667a6924c50b0ca3df235f Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 26 Nov 2018 16:28:06 -0800 Subject: Upgraded/autoformatted. --- compatibility/2.3.nom | 2 +- compatibility/2.4.nom | 2 +- compatibility/2.5.5.5.nom | 2 +- compatibility/2.5.nom | 2 +- compatibility/2.nom | 2 +- compatibility/3.5.5.6.nom | 2 +- compatibility/3.6.nom | 2 +- compatibility/3.7.nom | 2 +- compatibility/3.8.nom | 2 +- compatibility/3.nom | 2 +- compatibility/4.10.12.7.nom | 2 +- compatibility/4.11.nom | 9 ++++++--- compatibility/4.12.nom | 2 +- compatibility/4.8.10.nom | 2 +- compatibility/4.9.nom | 2 +- compatibility/compatibility.nom | 4 +++- 16 files changed, 23 insertions(+), 18 deletions(-) (limited to 'compatibility') diff --git a/compatibility/2.3.nom b/compatibility/2.3.nom index 1664429..21eb2f2 100644 --- a/compatibility/2.3.nom +++ b/compatibility/2.3.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <2.3 to Nomsu 2.3 diff --git a/compatibility/2.4.nom b/compatibility/2.4.nom index dbc6517..edc9f38 100644 --- a/compatibility/2.4.nom +++ b/compatibility/2.4.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <2.4 to Nomsu 2.4 diff --git a/compatibility/2.5.5.5.nom b/compatibility/2.5.5.5.nom index 6da70d4..34bc513 100644 --- a/compatibility/2.5.5.5.nom +++ b/compatibility/2.5.5.5.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <2.5.5.5 to Nomsu 2.5.5.5 diff --git a/compatibility/2.5.nom b/compatibility/2.5.nom index a1a33b7..3e11a85 100644 --- a/compatibility/2.5.nom +++ b/compatibility/2.5.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <2.5 to Nomsu 2.5 diff --git a/compatibility/2.nom b/compatibility/2.nom index 311002d..8004e42 100644 --- a/compatibility/2.nom +++ b/compatibility/2.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu 1 to Nomsu 2 diff --git a/compatibility/3.5.5.6.nom b/compatibility/3.5.5.6.nom index c428b0d..7131d5e 100644 --- a/compatibility/3.5.5.6.nom +++ b/compatibility/3.5.5.6.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <3.5.5.6 to Nomsu 3.5.5.6 diff --git a/compatibility/3.6.nom b/compatibility/3.6.nom index fad8a32..bd08455 100644 --- a/compatibility/3.6.nom +++ b/compatibility/3.6.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <3.6 to 3.6 diff --git a/compatibility/3.7.nom b/compatibility/3.7.nom index 26b643f..9bbc4ba 100644 --- a/compatibility/3.7.nom +++ b/compatibility/3.7.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <3.7 to 3.7 diff --git a/compatibility/3.8.nom b/compatibility/3.8.nom index d70e6e8..12d656e 100644 --- a/compatibility/3.8.nom +++ b/compatibility/3.8.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <3.8 to 3.8 (Text method changes) diff --git a/compatibility/3.nom b/compatibility/3.nom index 87f5c0c..cad5de9 100644 --- a/compatibility/3.nom +++ b/compatibility/3.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <=2 to Nomsu 3 diff --git a/compatibility/4.10.12.7.nom b/compatibility/4.10.12.7.nom index 28c07af..5887684 100644 --- a/compatibility/4.10.12.7.nom +++ b/compatibility/4.10.12.7.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <4.10.12.7 to 4.10.12.7 use "compatibility/compatibility.nom" diff --git a/compatibility/4.11.nom b/compatibility/4.11.nom index 8021be3..5226895 100644 --- a/compatibility/4.11.nom +++ b/compatibility/4.11.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <4.11 to Nomsu 4.11 (overhaul of function literals, deleting (if all of ...), etc. shorthand) @@ -45,8 +45,11 @@ upgrade action (line number of %pos in %text) to "4.11" as (..) # 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 ---) +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 (..) diff --git a/compatibility/4.12.nom b/compatibility/4.12.nom index 17d90ff..24809ab 100644 --- a/compatibility/4.12.nom +++ b/compatibility/4.12.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.12 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <4.11 to Nomsu 4.11 (overhaul of function literals, deleting (if all of ...), etc. shorthand) diff --git a/compatibility/4.8.10.nom b/compatibility/4.8.10.nom index f20886f..78ef6a6 100644 --- a/compatibility/4.8.10.nom +++ b/compatibility/4.8.10.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <4.8.10 to 4.8.10 (renaming "action" -> "means") use "compatibility/compatibility.nom" diff --git a/compatibility/4.9.nom b/compatibility/4.9.nom index 5dc0d29..acfbc29 100644 --- a/compatibility/4.9.nom +++ b/compatibility/4.9.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file defines upgrades from Nomsu <4.9 to 4.9 use "compatibility/compatibility.nom" diff --git a/compatibility/compatibility.nom b/compatibility/compatibility.nom index 4d96d89..56a3b2c 100644 --- a/compatibility/compatibility.nom +++ b/compatibility/compatibility.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V4.11.12.8 +#!/usr/bin/env nomsu -V4.12.12.8 # This file contains code for defining ways to upgrade code between different versions of Nomsu. @@ -92,11 +92,13 @@ externally [..] add %k = (%v upgraded from %start_version to %end_version) set %with_upgraded_args's metatable to (%tree's metatable) %tree = (%UPGRADES.%ver %with_upgraded_args %end_version) + if (%tree.version != %end_version): %tree = (SyntaxTree {: for %k = %v in %tree: add %k = %v}) %tree.version = %end_version if %tree.shebang: %tree.shebang = "#!/usr/bin/env nomsu -V\%end_version\n" + return %tree externally (%tree upgraded from %start_version) means (..) -- cgit v1.2.3