aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2020-02-03 10:25:42 +0000
committers-ol <s-ol@users.noreply.github.com>2020-02-03 10:25:42 +0000
commitfef107d534b67d63d95d1b805adc97a43ffedf5a (patch)
tree5579f80bc0f32f5425328b0dfd4028ca02d4ce39
parentfix logger and tests (diff)
downloadalive-fef107d534b67d63d95d1b805adc97a43ffedf5a.tar.gz
alive-fef107d534b67d63d95d1b805adc97a43ffedf5a.zip
fix error handling again
-rw-r--r--copilot.moon12
-rw-r--r--logger.moon2
-rw-r--r--registry.moon2
3 files changed, 10 insertions, 6 deletions
diff --git a/copilot.moon b/copilot.moon
index e609a24..802688c 100644
--- a/copilot.moon
+++ b/copilot.moon
@@ -23,15 +23,19 @@ class Copilot
root = program\match slurp @file
if not root
- L\error "parse error"
+ L\error "error parsing"
+ return
+
+ ok, err = pcall @registry\retag, root
+ if not ok
+ L\error "error expanding: #{err}"
return
- @registry\retag root
spit @file, root\stringify!
- ok, err = pcall @registry\link
+ ok, err = pcall @registry\patch!
if not ok
- L\error "error linking: #{err}"
+ L\error "error patching: #{err}"
tb = (msg) -> debug.traceback msg, 2
poll: =>
diff --git a/logger.moon b/logger.moon
index afe59b5..e660289 100644
--- a/logger.moon
+++ b/logger.moon
@@ -12,7 +12,7 @@ class Logger
}
mklog = (max_level) ->
- new: (level='trace') =>
+ new: (level='log') =>
@level = levels[level] or level
@prefix = ' '
diff --git a/registry.moon b/registry.moon
index bb33916..6c4548b 100644
--- a/registry.moon
+++ b/registry.moon
@@ -44,7 +44,7 @@ class Registry
sexpr.tag = tag
@map[tag] = sexpr
- link: =>
+ patch: =>
-- third pass (inout):
-- * patch expressions (spawn/patch)
for typ, node in @root\walk 'inout', false