aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Hill <bitbucket@bruce-hill.com>2018-07-23 15:28:35 -0700
committerBruce Hill <bitbucket@bruce-hill.com>2018-07-23 15:29:03 -0700
commit765cc704d5e9d652dc606440203e8c6a0fd3361e (patch)
tree8b348bed84a9111d87335e48136169062200b86f
parent991d9994e9a792a47dd0fac6ab2d1b5a110b65c8 (diff)
Renamed nomsu_tree -> syntax_tree, so anyone looking for syntax trees
knows where to look.
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--nomsu_compiler.lua2
-rw-r--r--nomsu_compiler.moon2
-rw-r--r--parser.lua2
-rw-r--r--parser.moon2
-rw-r--r--syntax_tree.lua (renamed from nomsu_tree.lua)0
-rw-r--r--syntax_tree.moon (renamed from nomsu_tree.moon)0
8 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 117ab76..dfd1eec 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ PREFIX=
UNINSTALL_VERSION=
# ========= You shouldn't need to mess with any of these variables below ================
-MOON_FILES= code_obj.moon error_handling.moon files.moon nomsu.moon nomsu_compiler.moon nomsu_tree.moon parser.moon
+MOON_FILES= code_obj.moon error_handling.moon files.moon nomsu.moon nomsu_compiler.moon syntax_tree.moon parser.moon
LUA_FILES= code_obj.lua consolecolors.lua error_handling.lua files.lua nomsu.lua nomsu_compiler.lua \
- nomsu_tree.lua parser.lua utils.lua uuid.lua
+ syntax_tree.lua parser.lua utils.lua uuid.lua
CORE_NOM_FILES= $(wildcard core/*.nom)
CORE_LUA_FILES= $(patsubst %.nom,%.lua,$(CORE_NOM_FILES))
LIB_NOM_FILES= $(wildcard lib/*.nom)
diff --git a/README.md b/README.md
index e19f27a..26301da 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ All `.moon` files have been precompiled into corresponding `.lua` files, so you
* `nomsu.peg` - The [Parsing Expression Grammar](https://en.wikipedia.org/wiki/Parsing_expression_grammar) used to define Nomsu's syntax. The format of this file is a slightly modified version of the format accepted by LPEG's `re` module.
* `nomsu_compiler.moon` - **The actual Nomsu compiler**. This file can be imported and used without going through the regular command line interface (e.g. for applications that want to embed the compiler).
* `parser.moon` - The Nomsu parser. This file can also be imported and used directly for applications that only need to *parse* Nomsu, not compile it.
-* `nomsu_tree.moon` - Datastructures used for Nomsu ASTs.
+* `syntax_tree.moon` - Datastructures used for Nomsu Abstract Syntax Trees.
* `code_obj.moon` - Datastructures used for incrementally building generated code, while preserving code origins.
* `error_handling.moon` - The logic for producing good error messages within Lua that reference the Nomsu source code that led to them.
* `utils.lua` - A set of utility actions used by nomsu.moon.
diff --git a/nomsu_compiler.lua b/nomsu_compiler.lua
index 0299156..42b1a1d 100644
--- a/nomsu_compiler.lua
+++ b/nomsu_compiler.lua
@@ -28,7 +28,7 @@ do
local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end
-local AST = require("nomsu_tree")
+local AST = require("syntax_tree")
local Parser = require("parser")
SOURCE_MAP = { }
string.as_lua_id = function(str)
diff --git a/nomsu_compiler.moon b/nomsu_compiler.moon
index 2856ff2..ee5eca4 100644
--- a/nomsu_compiler.moon
+++ b/nomsu_compiler.moon
@@ -21,7 +21,7 @@ colored = setmetatable({}, {__index:(_,color)-> ((msg)-> colors[color]..tostring
unpack or= table.unpack
{:match, :sub, :gsub, :format, :byte, :find} = string
{:NomsuCode, :LuaCode, :Source} = require "code_obj"
-AST = require "nomsu_tree"
+AST = require "syntax_tree"
Parser = require("parser")
-- Mapping from source string (e.g. "@core/metaprogramming.nom[1:100]") to a mapping
-- from lua line number to nomsu line number
diff --git a/parser.lua b/parser.lua
index d563005..1a567c8 100644
--- a/parser.lua
+++ b/parser.lua
@@ -19,7 +19,7 @@ do
local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end
-local AST = require("nomsu_tree")
+local AST = require("syntax_tree")
local NOMSU_DEFS
do
local _with_0 = { }
diff --git a/parser.moon b/parser.moon
index cf67205..a961b0b 100644
--- a/parser.moon
+++ b/parser.moon
@@ -7,7 +7,7 @@ lpeg.setmaxstack 10000
{:insert, :remove} = table
files = require 'files'
{:NomsuCode, :LuaCode, :Source} = require "code_obj"
-AST = require "nomsu_tree"
+AST = require "syntax_tree"
NOMSU_DEFS = with {}
-- Newline supports either windows-style CR+LF or unix-style LF
diff --git a/nomsu_tree.lua b/syntax_tree.lua
index 64b4efc..64b4efc 100644
--- a/nomsu_tree.lua
+++ b/syntax_tree.lua
diff --git a/nomsu_tree.moon b/syntax_tree.moon
index 885892f..885892f 100644
--- a/nomsu_tree.moon
+++ b/syntax_tree.moon