Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
957 Commits 1 Branch 0 Tags 2.1 MiB
7f30fb293f
Commit Graph

290 Commits

Author SHA1 Message Date
Bruce Hill
79d4bd5125 Got rid of repr() use and replaced with :as_lua() or :as_nomsu() in as 
many places as possible.
 2018-09-18 19:49:29 -07:00
Bruce Hill
d11f9bc5d3 Oops, added "$" to ensure keywords with suffixes don't get changed. 2018-09-18 17:42:01 -07:00
Bruce Hill
96e5e567cb Working module system. 2018-09-16 16:57:24 -07:00
Bruce Hill
e22c35681f Auto-upgraded everything. 2018-09-14 19:17:16 -07:00
Bruce Hill
9e10c8bf00 Removing dead code and string.as_lua_id() (now just set on string 
metametatable)
 2018-09-10 16:37:16 -07:00
Bruce Hill
7c6047254e Upgraded to 3.8 (text method changes) and fixed some bugs in 
tree_to_nomsu.
 2018-09-10 16:26:27 -07:00
Bruce Hill
a35d010dfe Removed the mandatory "_" prefix for Nomsu variables, renamed "list" and 
"dict" to "List" and "Dict", or in Nomsu's environment, "_List" and
"_Dict", removed uuid.lua and replaced it with core/id.nom for handling
IDs.
 2018-09-06 12:48:16 -07:00
Bruce Hill
e1bc075bb5 Removing the "A_" prefix on action names, and improving the quality of 
as_lua_id() (guaranteed injectivity).
 2018-08-31 15:22:32 -07:00
Bruce Hill
18126da9c5 Auto-upgraded to 3.7 2018-08-30 14:16:18 -07:00
Bruce Hill
4f30e02acb Handling more compatibility stuff, including Lua 5.4, and a backup for 
if openssl module is not found, and moving containers (List/Dict) into
their own file, as well as bit operators (and support for __bxor, etc.
metamethods in Lua 5.2/LuaJIT)
 2018-08-29 19:39:15 -07:00
Bruce Hill
811fdd6856 Tweaked version 3.6 to include deprecating list append/removal functions 
in favor of using a method call style.
 2018-08-29 16:00:04 -07:00
Bruce Hill
dcb5e8add2 Fully updated to 3.6, deprecated old LuaCode global functions like "to 1 
write 2" and replaced them with method calls like "1::append 2"
 2018-08-29 15:10:27 -07:00
Bruce Hill
e64632be1a Switched "as_lua_id" to not add an underscore by default, and just add 
it manually to variables and A_ as a prefix to actions. Now, by default,
classes and method calls don't use the A_ prefix, which means nomsu can
more easily play nice with regular Lua objects.
 2018-08-29 14:20:18 -07:00
Bruce Hill
5ee9bcb7fb Upgraded version to 3.5.5.6, corresponding to Object Oriented changes. 2018-08-28 15:34:45 -07:00
Bruce Hill
e44acbf338 Lots of overhaul, supporting a new Object Oriented approach (e.g. 
%obj::action 1 2) and syntax.
 2018-08-28 15:08:07 -07:00
Bruce Hill
930d522fbc Bunch of miscellaneous changes. Paved the way a little bit for having 
different compiler domains.
 2018-08-27 13:39:22 -07:00
Bruce Hill
c6a7b0be9e Added compatibility for 2.5.5.5 (file hash changes). 2018-07-30 19:39:32 -07:00
Bruce Hill
56143adf97 Updated lib version (for training_wheels and base64). 2018-07-30 19:12:16 -07:00
Bruce Hill
445b3d5b5d Updated training wheels (much overdue). 2018-07-30 19:11:12 -07:00
Bruce Hill
ab4ebdf175 Changed autoformatting rules to ensure tests get clumped together with 
the thing below them.
 2018-07-30 15:06:03 -07:00
Bruce Hill
2a12310b25 Switching hashes to use base64 instead of hex. 2018-07-30 14:11:45 -07:00
Bruce Hill
a69555bc03 Updated version numbers. 2018-07-25 13:49:17 -07:00
Bruce Hill
b6c99c56a1 Updated package.nomsupath behavior to first search the installed 
locations, *then* search the current directory. This makes the system `nomsu` run
properly, even if the local directory has a broken file that has the
same name as a nomsu file.
 2018-07-24 15:09:55 -07:00
Bruce Hill
3cf97066be Cleaning up code to make use of newer API. 2018-07-24 14:07:25 -07:00
Bruce Hill
09d797eddc Updating code to latest version. 2018-07-23 15:25:03 -07:00
Bruce Hill
6e5d551071 Run 'use "core"' by default before running anything else, unless --no-core command line flag is used. 2018-07-23 14:54:05 -07:00
Bruce Hill
470a6fe7f9 Fixed blocks starting with extra newline when they start with a comment. 2018-07-23 14:41:30 -07:00
Bruce Hill
4c1f0aca7a Moving all the rest of the tests over to inline versions. 2018-07-22 16:30:49 -07:00
Bruce Hill
addac10a47 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.
 2018-07-22 15:01:05 -07:00
Bruce Hill
dfd39f0b14 Shifting further towards having inline tests. Also added a helper 
function for directly extracting source lines from a Source or AST.
 2018-07-22 13:59:08 -07:00
Bruce Hill
ae4670bd8e Improvements working towards better inline tests. Improved handling of 
file spoofing and adding -e command line flag for executing a string.
 2018-07-21 14:44:26 -07:00
Bruce Hill
6728587dfc Auto-formatted and auto-upgraded everything! 2018-07-20 20:27:27 -07:00
Bruce Hill
bf67a61013 Updating to version 2.4.4.3, with new syntax for multi-statement 'if' 
and switch statements.
 2018-07-18 17:56:15 -07:00
Bruce Hill
d5cfaa37be Upgrading to version 2.3 (main change: "=" instead of "<-" for 
assignment)
 2018-07-18 01:28:17 -07:00
Bruce Hill
88df5c72a3 Updating lib to v2 2018-07-17 23:37:26 -07:00
Bruce Hill
ba639f2bd0 Upgraded core code to latest Nomsu verison. 2018-07-17 23:08:24 -07:00
Bruce Hill
cbd1437752 Optimization/simplification pass. 2018-07-17 16:13:55 -07:00
Bruce Hill
be06fc096a Major changes to how versioning and parsing work. This should be a 
better path going forward to handling upgrades. Old syntax files will
stick around for compatibility purposes. Old syntax can be parsed into
valid syntax trees via the old syntax (.peg) files, and then old syntax
trees should be valid and can be upgraded via the normal code path. This
change has lots of improvements to Nomsu codegen too.
 2018-07-15 19:43:28 -07:00
Bruce Hill
ba2b83d566 Fixed nomsu codegen for indented text and improved text parsing. Also 
moved some more tests inline.
 2018-07-11 14:14:16 -07:00
Bruce Hill
85ef9534e3 Added pattern matching for text, and comprehension versions of that and 
file walking.
 2018-07-09 17:14:05 -07:00
Bruce Hill
65dc1f2196 Cleaning up metaprogramming a bit and fixing/adding test for recursion 
control flow.
 2018-06-26 15:53:00 -07:00
Bruce Hill
ad342b63b7 Simplifications/streamlining the Make process, and cleaning up some of 
how command line interaction and `use %` work.
 2018-06-24 16:11:40 -07:00
Bruce Hill
9f08215dfb Moved console colors from core/ into lib/ 2018-06-23 18:04:23 -07:00
Bruce Hill
863983202c Fixed up nomsupath behavior and refactored file stuff into its own file. 2018-06-23 17:22:43 -07:00
Bruce Hill
86a3219e7f Cleanup of some metaprogramming stuff, as well as adding support for 
"package.nomsupath" to search for files in different locations, and
prioritizing use of "luafilesystem" over system calls.
 2018-06-21 19:13:47 -07:00
Bruce Hill
16d127abb5 Initial working version. 2018-06-18 15:44:35 -07:00
Bruce Hill
1a6e28e835 Improvements to object system. 2018-06-15 00:17:09 -07:00
Bruce Hill
b12744d831 Some cleanup and fixes. Simplifying a lot of code, and extending the 
flexibility of scoping. Redesigned Object system too.
 2018-06-14 23:25:34 -07:00
Bruce Hill
49f1eb3d08 Reshuffling some files. 2018-06-14 22:17:37 -07:00
Bruce Hill
e7bdc35aa8 Cleanups to try/catch logic and object logic. 2018-06-04 17:23:13 -07:00
Bruce Hill
7cd4f276b7 Added todo 2018-05-30 17:27:10 -07:00
Bruce Hill
b53516c47c Simplified and correctified lib/object (though the codegen still need 
streamlining), added a .stub member to Action trees, and switched
Source's repr to be @filename[start:stop] instead of
"filename[start:stop]"
 2018-05-30 17:21:19 -07:00
Bruce Hill
624fcdcc7e Moved as_lua_id() onto 'string' 2018-05-30 13:46:54 -07:00
Bruce Hill
8cb2788e0d Re-added sources. 2018-05-26 15:04:38 -07:00
Bruce Hill
446892d11e Consolidating code obj code and expunging all [[..]]-style lua strings. 2018-05-24 16:13:46 -07:00
Bruce Hill
ba76a35e84 Fixed up file hash lib. 2018-05-24 15:33:12 -07:00
Bruce Hill
2e345e271f Misc changes, fixed up Object lib and tests. 2018-05-24 14:57:35 -07:00
Bruce Hill
3ffeaf1f5d Removed "for all"-style iteration and changed "for % from 1 to 10"-style 
to "for % in 1 to 10" for consistency.
 2018-05-15 20:33:07 -07:00
Bruce Hill
0a95a264e5 Cleaning up comments. 2018-05-15 18:56:00 -07:00
Bruce Hill
1a755ddee8 Added tentative support for luajit (depends on pure-lua LPEG 
implementation).
 2018-05-09 13:35:04 -07:00
Bruce Hill
5d59d510cd Removing end-of-line ":" and "(..)" for blocks (they just use 
indentation now).
 2018-04-25 16:31:09 -07:00
Bruce Hill
34a2f50ebc Deleted habit breaker. 2018-04-20 17:00:33 -07:00
Bruce Hill
da33269c30 All tests passing (except object) 2018-04-19 17:23:54 -07:00
Bruce Hill
d42d20c50a Re-added callstack callsite info. It's a bit hacky, but better than 
nothing.
 2018-04-09 18:58:27 -07:00
Bruce Hill
02af19153e Moved over to have tree metadata stored outside the tree. This paves the 
way for programmatically generating trees more easily.
 2018-02-08 16:23:23 -08:00
Bruce Hill
3661754ed9 Reverted to ACTIONS instead of ACTION and added 'show lua %' macro. 2018-02-06 22:07:11 -08:00
Bruce Hill
d02b4b8718 Added a bunch of metamethod stuff. 2018-02-05 15:11:49 -08:00
Bruce Hill
505fec2a61 Restructured the nomsu files to group all the essentials into core/ and 
all the optionals into lib/. lib/core.nom and tests/all.nom are no
longer needed now.
 2018-02-02 15:49:42 -08:00
Bruce Hill
a387fd86a8 Added colons for aesthetics. 2018-01-31 15:31:13 -08:00
Bruce Hill
b1406a3203 Removed "core_defs" 2018-01-30 16:41:51 -08:00
Bruce Hill
0563571625 Overhaul of indentations. Now strictly requiring exactly 4 spaces 
everywhere, and supporting indented string interpolations.
 2018-01-30 15:11:18 -08:00
Bruce Hill
d7abcba34d Fix for bad indentation. 2018-01-30 15:10:29 -08:00
Bruce Hill
27c8024888 Added numeric-for list comprehension 2018-01-29 15:14:50 -08:00
Bruce Hill
90c56d3135 Added a ton of tests for virtually all the functionality. Helped me find 
and fix a lot of latent problems.
 2018-01-26 20:20:38 -08:00
Bruce Hill
214b3f9186 Removed nomsu:write() and nomsu:writeln() and replaced with just plain 
ol' print()
 2018-01-26 15:02:32 -08:00
Bruce Hill
0c0fb98389 Added some training wheels for functions. 2018-01-25 18:08:04 -08:00
Bruce Hill
90b2888d46 Fixed up how_do_i with updated syntax. 2018-01-25 17:44:09 -08:00
Bruce Hill
c79bea4401 Overhaul of compiling API (eliminated some of the expr/statements 
helpers and forced the use of {expr=..., locals=...}-type syntax. This
helped fix up all of the cases like loops where locals were being
mishandled and led to some cleaner code.
 2018-01-25 17:36:05 -08:00
Bruce Hill
f769351556 Updated and improve syntax for some stuff. Also added string indexing 
like in python, including slices.
 2018-01-24 13:13:26 -08:00
Bruce Hill
d173e9ae88 Fixed id for nil/NaN and cleaned up collection metatable stuff. 2018-01-24 12:38:09 -08:00
Bruce Hill
566b7d09c8 Updated training wheels with new syntax and print(). 2018-01-24 03:00:31 -08:00
Bruce Hill
42d950f7b4 Fix for some old syntax. 2018-01-24 02:55:49 -08:00
Bruce Hill
a33cb2598f Cleaned up code duplication in 'compile % to %' and 'compile % to code 
%' and improved generated lua output for the common case (a text value).
 2018-01-24 01:38:55 -08:00
Bruce Hill
30639f52e1 Added "export" for explicitly non-local variables. 2018-01-23 19:42:14 -08:00
Bruce Hill
49f0e95571 Prevented redeclaration of function arguments as locals. 2018-01-23 19:29:11 -08:00
Bruce Hill
6d11354b3f Added implicit local declarations and new syntax of %var <- %value. 2018-01-23 19:22:45 -08:00
Bruce Hill
376dd65278 Updated and fixed up how_do_i 2018-01-19 18:13:13 -08:00
Bruce Hill
4764842fe6 Updated class.nom for new syntax. 2018-01-19 17:32:01 -08:00
Bruce Hill
c1ac0635fd Refactored syntax a bit so that ":" isn't necessary for a block, and can 
be used for inline expressions instead. Also, dict literals now use ":" instead
of "=".
 2018-01-19 17:30:39 -08:00
Bruce Hill
7759b778f6 Cleaned up code output to be just a series of declarations, instead of a 
table literal and a loop.
 2018-01-18 16:45:24 -08:00
Bruce Hill
f91d06d9fa Initial commit of object oriented classes. 2018-01-18 01:49:27 -08:00
Bruce Hill
8bbebb8735 Completely fixed/reworked tree_to_nomsu, and it's okay right now. 2018-01-17 16:37:27 -08:00
Bruce Hill
4c059a7f9b Removed unnecessary semicolons that broke luajit. 2018-01-16 01:44:50 -08:00
Bruce Hill
5a526675db Better usage of ACTION_METADATA and deprecating nomsu.defs. 2018-01-12 19:28:19 -08:00
Bruce Hill
268a636157 Optimized loops to use local vars in loop definitions when possible. 2018-01-12 17:08:05 -08:00
Bruce Hill
b5ae7dac51 Added indent action 2018-01-12 17:07:35 -08:00
Bruce Hill
90c72074db Renamed replaced_vars() to be more descriptive. 2018-01-12 16:45:49 -08:00
Bruce Hill
6b09187899 Switched to use load() with environment table instead of passing in 
nomsu to everything. This has some nice code cleanliness benefits.
 2018-01-12 16:33:11 -08:00
Bruce Hill
e09f05a50c Reshuffled all the library code into files that make more sense and 
cleaned up some of the library code.
 2018-01-11 18:51:21 -08:00
Bruce Hill
7251f75087 Added "local %" macro as a stopgap for locals. 2018-01-11 15:32:54 -08:00
Bruce Hill
1e0dc6e477 Moved text utilities into their own file. 2018-01-11 15:27:15 -08:00
Bruce Hill
60aa3f5fcf Fixed ipairs->pairs to make dict iteration work. 2018-01-11 15:26:51 -08:00
Bruce Hill
3fbc89273d Removed some dead code and streamlined the API a bit. Also added 
training wheels for ease of transitions.
 2018-01-11 04:38:46 -08:00
Bruce Hill
756c1f718e Renamed "require %" to "use %" 2018-01-11 03:35:35 -08:00
Bruce Hill
9d8c701441 Added "%'s id" to use UUIDs and changed "% = %" to "set % = %" and some 
other misc.
 2018-01-11 03:32:12 -08:00
Bruce Hill
bfe66a70e6 Renamed "% mod %" to "wrap % around %" 2018-01-11 02:18:09 -08:00
Bruce Hill
8c1da9a6c3 Purged references to "macro" and replaced with "compile action" or 
"compile-time action".
 2018-01-11 02:07:37 -08:00
Bruce Hill
199161a438 Renamed def->define_action and defmacro->define_macro 2018-01-11 01:57:52 -08:00
Bruce Hill
82cc997ddf Renamed rule % = % to action % % 2018-01-11 01:19:03 -08:00
Bruce Hill
6f4b67632a Renamed String -> Text 2018-01-11 01:09:26 -08:00
Bruce Hill
c0333ca315 Overhaul of error reporting and removing nomsu:call(stub, line_no, ...) in favor of nomsu.defs[stub].fn(...) 2018-01-11 01:04:17 -08:00
Bruce Hill
53a9d4eae8 Pretty much mostly working. 2018-01-10 20:45:03 -08:00
Bruce Hill
421abe1a6f Cleaned up metaprogramming to go "compile to" -> "rule =" -> "parse as". 
This speeds things up a bit, and is more intuitive.
 2018-01-09 14:59:06 -08:00
Bruce Hill
f97ab858ed Modernized the codebase a bit to include "immediately:" for immediately 
running code before further parsing takes place. That means that in the
default case, whole files can be run at once, which makes all but the
weirdest edge cases make a lot more sense and operate smoothly.
 2018-01-08 18:53:57 -08:00
Bruce Hill
568a44ef19 Reworking some stuff so that functions only allow expressions to be 
return values with either an explicit "return" statement or if they're
the only line in the function, and the line is an expression.
 2018-01-07 18:45:27 -08:00
Bruce Hill
c92e5fbc81 Some overhaul of binary operators so that arbitrary math patterns work 
fine.
 2018-01-07 18:03:37 -08:00
Bruce Hill
b1c6354464 Added substring operator %x|start - stop| 2018-01-07 16:51:29 -08:00
Bruce Hill
2df539a762 More cleanup of vars.XX -> \%XX 2018-01-05 15:45:46 -08:00
Bruce Hill
139bd76efc Cleaning up vars.XX use and removing typecheck. 2018-01-05 15:42:06 -08:00
Bruce Hill
cd4196d365 Tidying. 2018-01-03 01:04:21 -08:00
Bruce Hill
cfee75b21b Reworked {} a bit and added dicts to the core language. Did some more 
testing on string interpolations too.
 2018-01-03 00:52:01 -08:00
Bruce Hill
4789892824 Got everything mostly working. 2017-12-30 14:31:07 -08:00
Bruce Hill
3c303018bb Tweaks. 2017-12-15 15:30:05 -08:00
Bruce Hill
1111210047 Updating some more stuff. 2017-12-14 13:57:53 -08:00
Bruce Hill
536a3ba649 Got it working. 2017-12-13 16:29:15 -08:00
Bruce Hill
0c1c406ce0 More updates with more functional macros and source code storage. 2017-12-11 17:53:23 -08:00
Bruce Hill
96441251c4 Pretty much everything is working?? 2017-12-09 15:34:52 -08:00
Bruce Hill
5903820699 Incremental progress towards working. 2017-12-04 17:54:52 -08:00
Bruce Hill
b3b8c4d731 Some stuff changed to allow escaped args and some other ports from the 
two_defs branch.
 2017-12-04 17:35:47 -08:00
Bruce Hill
3ae1f696aa Fixed remove rule rule. 2017-11-01 20:00:52 -07:00
Bruce Hill
87b2cce8e5 Added remove rule rule. 2017-11-01 19:59:44 -07:00
Bruce Hill
fb3936269f Removed broken code. 2017-11-01 16:49:52 -07:00
Bruce Hill
f1a2c936de Fixed some codegen stuff, optimized "say" for the common case of string 
literals.
 2017-11-01 16:49:11 -07:00
Bruce Hill
cbd876673a Added gsub. 2017-11-01 15:58:19 -07:00
Bruce Hill
8c7915e466 Added try/except. 2017-11-01 15:52:28 -07:00
Bruce Hill
6ba79a8ff1 Added support for serializing rules. 2017-10-31 16:19:08 -07:00
Bruce Hill
60a85bbd8b Removed some unnecessary semicolons on keywords. 2017-10-23 16:28:45 -07:00
Bruce Hill
9f61e7f90d Misc. cleanups. 2017-10-19 18:56:42 -07:00
Bruce Hill
ca5896b7bd Finally fixed the bullshit way that string literals were converted to lua. 2017-10-19 18:16:15 -07:00
Bruce Hill
c7994cf720 Added some constants to utils. 2017-10-19 17:28:41 -07:00
Bruce Hill
b98059261c Abbreviated "lua code" to "lua>" and "lua expr" to "=lua" and "lua 
block" to "lua do>"
 2017-10-19 17:00:10 -07:00
Bruce Hill
443f8c73bb Added default dict. 2017-10-19 16:34:38 -07:00
Bruce Hill
9dee9dbbd8 Made symbols group with each other, instead of *every* one being alone. 2017-10-13 19:43:55 -07:00
Bruce Hill
bccfe9d8e1 Changed tokenizing to treat symbols as their own things. 2017-10-13 19:41:58 -07:00
Bruce Hill
e476bfea52 Improved code generation for "when" statements using elseif, and 
improved code generation for loops by omitting goto labels when not used.
 2017-10-13 18:09:04 -07:00
Bruce Hill
d13bcde2b9 Renamed repr_if_not_string to "stringify" and added nomsu:stringify for 
convenience.
 2017-10-13 16:16:07 -07:00
Bruce Hill
7435b61380 Changed generated code to be less verbose for function and macro defs 
(using "foo %" syntax instead of {type="FunctionCall", ...} literals).
 2017-10-13 16:10:47 -07:00
Bruce Hill
454bb76e2f Added chain and "with". 2017-10-12 14:39:03 -07:00
Bruce Hill
4e5445e6bc Added table.remove to collections. 2017-10-11 20:32:31 -07:00
Bruce Hill
a858775a68 Fixing up sorting more. 2017-10-09 20:17:38 -07:00