diff options
| author | Miki Tebeka <miki.tebeka@gmail.com> | 2015-03-01 06:12:42 +0200 |
|---|---|---|
| committer | Miki Tebeka <miki.tebeka@gmail.com> | 2015-03-01 06:12:42 +0200 |
| commit | 9fb199e2cb2cf44cd61c2a226193a70f6013aadc (patch) | |
| tree | 325a2a8e33e3e8d18217d10854152cab82ac8b61 /scala | |
| parent | 49916f9402e30a5277146355be878b32ec30f46d (diff) | |
| parent | 2cb013877c4ed41d245ce7c5525405c4833c503d (diff) | |
| download | mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.tar.gz mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.zip | |
Merge branch 'master' of https://github.com/kanaka/mal
Diffstat (limited to 'scala')
| -rw-r--r-- | scala/Makefile | 2 | ||||
| -rw-r--r-- | scala/stepA_mal.scala (renamed from scala/stepA_interop.scala) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scala/Makefile b/scala/Makefile index 10c2e11..29dd8aa 100644 --- a/scala/Makefile +++ b/scala/Makefile @@ -1,7 +1,7 @@ TESTS = SOURCES_BASE = types.scala reader.scala printer.scala -SOURCES_LISP = env.scala core.scala stepA_interop.scala +SOURCES_LISP = env.scala core.scala stepA_mal.scala SOURCES = $(SOURCES_BASE) $(SOURCES_LISP) #all: mal.scala diff --git a/scala/stepA_interop.scala b/scala/stepA_mal.scala index 2ba6b5a..5230cb1 100644 --- a/scala/stepA_interop.scala +++ b/scala/stepA_mal.scala @@ -2,7 +2,7 @@ import types.{MalList, _list, _list_Q, MalVector, MalHashMap, Func, MalFunction} import env.Env -object stepA_interop { +object stepA_mal { // read def READ(str: String): Any = { reader.read_str(str) |