diff --git a/sources/zweic/Analyzer.scala b/sources/zweic/Analyzer.scala index ae4846d..6c9eb91 100755 --- a/sources/zweic/Analyzer.scala +++ b/sources/zweic/Analyzer.scala @@ -40,8 +40,10 @@ case None => val cs = ClassSymbol(tree.pos, name.name, None); classScope = classScope + name.name -> cs; + name.sym = cs; members.foreach(x => analyzeMember(cs,x)) } + case ClassDef(name, extend, members) => classScope.get(name.name) match { case Some(c) => @@ -50,9 +52,10 @@ classScope.get(extend.get.name) match { case None => Report.error(tree.pos, "superclass '" + extend.get.name + "' not defined") case _ => () - } + } val cs = ClassSymbol(tree.pos, name.name, classScope.get(extend.get.name)); classScope = classScope + name.name -> cs; + name.sym = cs; members.foreach(x => analyzeMember(cs,x)) } } diff --git a/unittest.py b/unittest.py index d9f8dbf..ebd131e 100644 --- a/unittest.py +++ b/unittest.py @@ -6,8 +6,8 @@ # #~iclamp/soft/bin/risc-emu COMPILER = "scala -cp classes zweic.GeneratorTest" -#RISC = "java -cp risc/lib/risc.jar risc.emulator.Main" -RISC = "/home/iclamp/soft/bin/risc-emu" +RISC = "java -cp risc/lib/risc.jar risc.emulator.Main" +#RISC = "/home/iclamp/soft/bin/risc-emu" OUTDIR = "asm" TABBING = '30'