Browse Source

Merge branch 'master', remote-tracking branch 'gokr/master'

Nicolas Petton 13 years ago
parent
commit
e008625c22
5 changed files with 33 additions and 7 deletions
  1. 2 1
      Makefile
  2. 0 0
      bin/amber
  3. 2 2
      repl/Makefile
  4. 1 1
      repl/REPL.js
  5. 28 3
      repl/amber.js

+ 2 - 1
Makefile

@@ -1,10 +1,11 @@
 # Makefile for sub directories
 AMBER = st
 SERVER = server
+REPL = repl
 EXAMPLES = examples
 
 # REST is all except AMBER
-REST = $(SERVER) $(EXAMPLES)
+REST = $(SERVER) $(EXAMPLES) $(REPL)
 
 # And these are all
 DIRS = $(AMBER) $(REST)

+ 0 - 0
bin/amber


+ 2 - 2
repl/Makefile

@@ -2,7 +2,7 @@ repl.js: REPL.st
 	../bin/amberc -m Repl -l Compiler,parser REPL.st amber
 
 run: repl.js
-	./amber
+	../bin/amber
 
 clean:
-	rm -f amber.js
+	rm -f amber.js REPL.js

File diff suppressed because it is too large
+ 1 - 1
repl/REPL.js


File diff suppressed because it is too large
+ 28 - 3
repl/amber.js


Some files were not shown because too many files changed in this diff