From addac10a47693a976808bf75fe63aed19f8dbb63 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Sun, 22 Jul 2018 15:01:05 -0700 Subject: Re-autoformatted everything. The main changes are: no longer adding a newline after 1-line indented code inside blocks, and forcing files to have a trailing newline. The trailing newline thing created a lot of spurious changes. --- lib/consolecolor.nom | 2 +- lib/file_hash.nom | 2 +- lib/object.nom | 3 +-- lib/training_wheels.nom | 1 - lib/version.nom | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/consolecolor.nom b/lib/consolecolor.nom index bfeaf81..35b6f42 100644 --- a/lib/consolecolor.nom +++ b/lib/consolecolor.nom @@ -22,4 +22,4 @@ for %name = %colornum in %colors: compile [\%name] to: Lua value (quote \(quote %escapecode)) compile [\%name %text] to Lua value ".." - (\\(quote \(quote %escapecode))..\\(%text as lua expr).."\\27[0m") \ No newline at end of file + (\\(quote \(quote %escapecode))..\\(%text as lua expr).."\\27[0m") diff --git a/lib/file_hash.nom b/lib/file_hash.nom index 7c5668e..07fe275 100644 --- a/lib/file_hash.nom +++ b/lib/file_hash.nom @@ -25,4 +25,4 @@ action [hash %, sha1 %]: =lua ".." \%hash:gsub('.', function(c) return string.format('%02x', string.byte(c)) end) -parse [hash of file %filename] as (sha1 (=lua "io.open(\%filename):read('*a')")) \ No newline at end of file +parse [hash of file %filename] as (sha1 (=lua "io.open(\%filename):read('*a')")) diff --git a/lib/object.nom b/lib/object.nom index f717cef..48e602a 100644 --- a/lib/object.nom +++ b/lib/object.nom @@ -11,7 +11,6 @@ compile [method %actions %body] to: declare locals in %lua for % in %actions: to %lua write "\nclass.\(% as lua id) = \(% as lua id)" - return (..) Lua ".." do -- Method: \(%actions.(1).stub) @@ -58,4 +57,4 @@ compile [object %classname extends %parent %class_body] to (..) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ parse [object %classname %class_body] as (..) - object %classname extends (nil) %class_body \ No newline at end of file + object %classname extends (nil) %class_body diff --git a/lib/training_wheels.nom b/lib/training_wheels.nom index 100927c..e89eee3 100644 --- a/lib/training_wheels.nom +++ b/lib/training_wheels.nom @@ -38,7 +38,6 @@ compile [function %args %body, lambda %args %body] to: lua> "\%body:convert_to_statements('return ');" for % in %args.value: lua> "\%body:remove_free_vars(\%);" - to %lua write %body to %lua write "\nend)" return %lua diff --git a/lib/version.nom b/lib/version.nom index 20ae762..b1034d8 100644 --- a/lib/version.nom +++ b/lib/version.nom @@ -1,3 +1,3 @@ #!/usr/bin/env nomsu -V2.5.4.3 # This file sets the current library version. -lua> "NOMSU_LIB_VERSION = 3" \ No newline at end of file +lua> "NOMSU_LIB_VERSION = 3" -- cgit v1.2.3