aboutsummaryrefslogtreecommitdiff
path: root/go
diff options
context:
space:
mode:
authorMiki Tebeka <miki.tebeka@gmail.com>2015-03-01 06:12:42 +0200
committerMiki Tebeka <miki.tebeka@gmail.com>2015-03-01 06:12:42 +0200
commit9fb199e2cb2cf44cd61c2a226193a70f6013aadc (patch)
tree325a2a8e33e3e8d18217d10854152cab82ac8b61 /go
parent49916f9402e30a5277146355be878b32ec30f46d (diff)
parent2cb013877c4ed41d245ce7c5525405c4833c503d (diff)
downloadmal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.tar.gz
mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.zip
Merge branch 'master' of https://github.com/kanaka/mal
Diffstat (limited to 'go')
-rw-r--r--go/Makefile4
-rw-r--r--go/src/stepA_mal/stepA_mal.go (renamed from go/src/stepA_interop/stepA_interop.go)0
2 files changed, 2 insertions, 2 deletions
diff --git a/go/Makefile b/go/Makefile
index 5c966f5..67e967b 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -6,14 +6,14 @@ SOURCES_BASE = src/types/types.go src/readline/readline.go \
src/reader/reader.go src/printer/printer.go \
src/env/env.go src/core/core.go
SOURCES_LISP = src/env/env.go src/core/core.go \
- src/stepA_interop/stepA_interop.go
+ src/stepA_mal/stepA_mal.go
SOURCES = $(SOURCES_BASE) $(word $(words $(SOURCES_LISP)),${SOURCES_LISP})
#####################
SRCS = step0_repl.go step1_read_print.go step2_eval.go step3_env.go \
step4_if_fn_do.go step5_tco.go step6_file.go step7_quote.go \
- step8_macros.go step9_try.go stepA_interop.go
+ step8_macros.go step9_try.go stepA_mal.go
BINS = $(SRCS:%.go=%)
#####################
diff --git a/go/src/stepA_interop/stepA_interop.go b/go/src/stepA_mal/stepA_mal.go
index 548d72b..548d72b 100644
--- a/go/src/stepA_interop/stepA_interop.go
+++ b/go/src/stepA_mal/stepA_mal.go