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 /java | |
| 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 'java')
| -rw-r--r-- | java/Makefile | 2 | ||||
| -rw-r--r-- | java/pom.xml | 4 | ||||
| -rw-r--r-- | java/src/main/java/mal/stepA_mal.java (renamed from java/src/main/java/mal/stepA_interop.java) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/java/Makefile b/java/Makefile index eff6e6f..f242ec0 100644 --- a/java/Makefile +++ b/java/Makefile @@ -5,7 +5,7 @@ TESTS = SOURCES_BASE = src/main/java/mal/readline.java src/main/java/mal/types.java \ src/main/java/mal/reader.java src/main/java/mal/printer.java SOURCES_LISP = src/main/java/mal/env.java src/main/java/mal/core.java \ - src/main/java/mal/stepA_interop.java + src/main/java/mal/stepA_mal.java SOURCES = $(SOURCES_BASE) $(SOURCES_LISP) #.PHONY: stats tests $(TESTS) diff --git a/java/pom.xml b/java/pom.xml index ae53194..fa2b567 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -47,7 +47,7 @@ </executions> <configuration> <!-- - <mainClass>mal.stepA_interop</mainClass> + <mainClass>mal.stepA_mal</mainClass> <arguments> <argument>foo</argument> <argument>bar</argument> @@ -69,7 +69,7 @@ <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>mal.stepA_interop</mainClass> + <mainClass>mal.stepA_mal</mainClass> </transformer> </transformers> </configuration> diff --git a/java/src/main/java/mal/stepA_interop.java b/java/src/main/java/mal/stepA_mal.java index 1fa1125..f8d4056 100644 --- a/java/src/main/java/mal/stepA_interop.java +++ b/java/src/main/java/mal/stepA_mal.java @@ -15,7 +15,7 @@ import mal.printer; import mal.env.Env; import mal.core; -public class stepA_interop { +public class stepA_mal { // read public static MalVal READ(String str) throws MalThrowable { return reader.read_str(str); |