Merge: mnit: Fix error on refined virtual types

Simple fix for the "Redef Error" in mnit clients: do not redef virtual types, instead assert the types in the users methods.

Pull-Request: #1751
Reviewed-by: Romain Chanoir <chanoir.romain@courrier.uqam.ca>
Reviewed-by: Jean Privat <jean@pryen.org>

diff --git a/contrib/benitlux/Makefile b/contrib/benitlux/Makefile
index 9bf30ac..7041b04 100644 (file)
--- a/contrib/benitlux/Makefile
+++ b/contrib/benitlux/Makefile
@@ -1,5 +1,7 @@
 all: server
 
+pre-build: src/benitlux_serial.nit
+
 server:
        mkdir -p bin/
        ../../bin/nitc --dir bin/ src/benitlux_daily.nit src/benitlux_web.nit

diff --git a/contrib/crazy_moles/Makefile b/contrib/crazy_moles/Makefile
index 113329d..232ec08 100644 (file)
--- a/contrib/crazy_moles/Makefile
+++ b/contrib/crazy_moles/Makefile
@@ -4,6 +4,8 @@ SVG2PNG=../inkscape_tools/bin/svg_to_png_and_nit
 
 default: bin/moles
 
+pre-build: assets/images/drawing.png
+
 bin/moles: $(shell ../../bin/nitls -M src/moles_linux.nit) assets/images/drawing.png
        mkdir -p bin
        ../../bin/nitc -o bin/moles src/moles_linux.nit

diff --git a/contrib/jwrapper/Makefile b/contrib/jwrapper/Makefile
index 7c41505..3173333 100644 (file)
--- a/contrib/jwrapper/Makefile
+++ b/contrib/jwrapper/Makefile
@@ -1,5 +1,7 @@
 all: bin/jwrapper
 
+pre-build: src/javap_test_parser.nit src/serial.nit
+
 ../nitcc/src/nitcc:
        make -C ../nitcc
 

diff --git a/contrib/memory/Makefile b/contrib/memory/Makefile
index ac91a73..a5a8c6d 100644 (file)
--- a/contrib/memory/Makefile
+++ b/contrib/memory/Makefile
@@ -14,6 +14,8 @@
 
 all: bin/memory
 
+pre-build: assets/images/drawing.png
+
 bin/memory: assets/images/drawing.png src/*.nit
        mkdir -p bin
        ../../bin/nitc -o bin/memory src/memory.nit -m ../../lib/mnit/linux/linux.nit

diff --git a/contrib/nitc b/contrib/nitc
new file mode 120000 (symlink)
index 0000000..5cd551c
--- /dev/null
+++ b/contrib/nitc
@@ -0,0 +1 @@
+../src
\ No newline at end of file

diff --git a/contrib/objcwrapper/Makefile b/contrib/objcwrapper/Makefile
index e248fb1..33ed110 100644 (file)
--- a/contrib/objcwrapper/Makefile
+++ b/contrib/objcwrapper/Makefile
@@ -1,5 +1,7 @@
 all: bin/objcwrapper
 
+pre-build: src/objc_parser.nit
+
 ../nitcc/src/nitcc:
        make -C ../nitcc
 

diff --git a/contrib/online_ide/Makefile b/contrib/online_ide/Makefile
index 6c06cf5..c8d231e 100644 (file)
--- a/contrib/online_ide/Makefile
+++ b/contrib/online_ide/Makefile
@@ -2,7 +2,7 @@
 ACE_BUILDS ?= ../../../ace-builds/
 
 default:
-       ../../bin/nitc --semi-global sources/nit/pnacl_nit.nit -I ../../src/
+       ../../bin/nitc --semi-global sources/nit/pnacl_nit.nit
        cp pnacl_nit/pnacl_nit.pexe www/pnacl/ -f
        rm -rf pnacl_nit/
 

diff --git a/contrib/online_ide/sources/nit/pnacl_nit.nit b/contrib/online_ide/sources/nit/pnacl_nit.nit
index ed8151d..567b0a2 100644 (file)
--- a/contrib/online_ide/sources/nit/pnacl_nit.nit
+++ b/contrib/online_ide/sources/nit/pnacl_nit.nit
@@ -17,11 +17,11 @@
 # A version of the naive Nit interpreter for PNaCl.
 module pnacl_nit
 
-import interpreter::naive_interpreter
-import interpreter::debugger
+import nitc::interpreter::naive_interpreter
+import nitc::interpreter::debugger
 import pnacl
-intrude import toolcontext
-intrude import loader
+intrude import nitc::toolcontext
+intrude import nitc::loader
 intrude import core::file
 
 # We redefine exit to start a new thread before killing the one that called exit.

diff --git a/contrib/simplan/Makefile b/contrib/simplan/Makefile
index 530c25e..367868e 100644 (file)
--- a/contrib/simplan/Makefile
+++ b/contrib/simplan/Makefile
@@ -3,6 +3,8 @@ NITCC=../nitcc/src/nitcc
 
 all: simplan
 
+pre-build: simplan_parser.nit
+
 simplan: simplan.nit simplan_parser.nit
        ${NITC} simplan.nit
 

diff --git a/contrib/tinks/Makefile b/contrib/tinks/Makefile
index ee13360..aeb7fbf 100644 (file)
--- a/contrib/tinks/Makefile
+++ b/contrib/tinks/Makefile
@@ -14,11 +14,13 @@
 
 all: bin/server bin/tinks
 
+pre-build: assets/images/drawing.png src/client/client_serialize.nit src/server/server_serialize.nit
+
 # Client
 bin/tinks: assets/images/drawing.png src/client/client_serialize.nit $(shell ../../bin/nitls -M src/client/linux_client.nit)
        ../../bin/nitc -o bin/tinks src/client/linux_client.nit -m src/client/client_serialize.nit
 
-src/client/client_serialize.nit: $(shell ../../bin/nitls -M src/client/client.nit)
+src/client/client_serialize.nit: assets/images/drawing.png $(shell ../../bin/nitls -M src/client/client.nit)
        ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
 
 assets/images/drawing.png: art/drawing.svg

diff --git a/lib/json/Makefile b/lib/json/Makefile
index 8d0650f..a8a5eb9 100644 (file)
--- a/lib/json/Makefile
+++ b/lib/json/Makefile
@@ -1,6 +1,6 @@
 NITCCDIR=../../contrib/nitcc/
 
-compile-parser: $(NITCCDIR)src/nitcc
+pre-build: $(NITCCDIR)src/nitcc
        $(NITCCDIR)src/nitcc $(NITCCDIR)examples/json.sablecc
 
 $(NITCCDIR)src/nitcc:

diff --git a/src/Makefile b/src/Makefile
index b46e488..6b9866a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,6 +22,9 @@ BINS=$(patsubst %,../bin/%,$(OBJS))
 
 all: bin/nitc
 
+pre-build:
+       ./git-gen-version.sh
+
 nitc_0: ../c_src/nitc parser/parser.nit
        @echo '***************************************************************'
        @echo '* Compile nitc_0 from NIT source files                        *'