Merge remote-tracking branch 'alexis/ready-for-ffi'
authorJean Privat <jean@pryen.org>
Wed, 30 Oct 2013 18:57:56 +0000 (14:57 -0400)
committerJean Privat <jean@pryen.org>
Wed, 30 Oct 2013 18:57:56 +0000 (14:57 -0400)
1  2 
lib/standard/exec.nit
lib/standard/kernel.nit
src/modelize_class.nit
src/phase.nit
tests/tests.sh

Simple merge
Simple merge
Simple merge
diff --cc src/phase.nit
@@@ -60,7 -60,11 +60,10 @@@ redef class ToolContex
                                end
                                errcount = self.error_count
                                for nclassdef in nmodule.n_classdefs do
+                                       self.info(" phase: {phase.class_name} for {nclassdef.location}", 3)
+                                       assert phase.toolcontext == self
+                                       phase.process_nclassdef(nclassdef)
                                        for npropdef in nclassdef.n_propdefs do
 -                                              self.info(" phase: {phase.class_name} for {npropdef.location}", 4)
                                                assert phase.toolcontext == self
                                                phase.process_npropdef(npropdef)
                                        end
diff --cc tests/tests.sh
Simple merge