--- a/Make.proto	Mon Dec 28 15:09:00 2009 +0000
+++ b/Make.proto	Mon Dec 28 16:20:44 2009 +0000
@@ -0,0 +1,155 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: cvut_stx_goodies_newcompiler.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# The Makefile as generated by this Make.proto supports the following targets:
+#    make         - compile all st-files to a classLib
+#    make clean   - clean all temp files
+#    make clobber - clean all
+#
+# This file contains definitions for Unix based platforms.
+# It shares common definitions with the win32-make in Make.spec.
+
+#
+# position (of this package) in directory hierarchy:
+# (must point to ST/X top directory, for tools and includes)
+TOP=../../../../stx
+INCLUDE_TOP=$(TOP)/..
+
+# subdirectories where targets are to be made:
+SUBDIRS=
+
+
+# subdirectories where Makefiles are to be made:
+# (only define if different from SUBDIRS)
+# ALLSUBDIRS=
+
+REQUIRED_SUPPORT_DIRS=
+
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALINCLUDES=-Ifoo -Ibar
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/refactoryBrowser/parser -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcompat -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libtool
+
+
+# if you need any additional defines for embedded C code,
+# add them here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
+LOCALDEFINES=
+
+LIBNAME=libcvut_stx_goodies_newcompiler
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H.  -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+all:: preMake classLibRule postMake
+
+pre_objs::  update-svn-revision
+
+
+
+update-svn-revision:
+	sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
+		cvut_stx_goodies_newcompiler.st
+.PHONY: update-svn-revision
+
+
+# add more install actions here
+install::
+
+# add more install actions for aux-files (resources) here
+installAux::
+
+# add more preMake actions here
+preMake::
+
+# add more postMake actions here
+postMake:: cleanjunk
+
+prereq: $(REQUIRED_SUPPORT_DIRS)
+	cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libwidg3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+
+
+cleanjunk::
+
+clean::
+	-rm -f *.o *.H
+
+clobber:: clean
+	-rm -f *.so *.dll
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)IRBuilder.$(O) IRBuilder.$(H): IRBuilder.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRBuilderTest.$(O) IRBuilderTest.$(H): IRBuilderTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRBytecodeGenerator.$(O) IRBytecodeGenerator.$(H): IRBytecodeGenerator.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRFunction.$(O) IRFunction.$(H): IRFunction.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRInstruction.$(O) IRInstruction.$(H): IRInstruction.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRInterpreter.$(O) IRInterpreter.$(H): IRInterpreter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRSequence.$(O) IRSequence.$(H): IRSequence.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRStackCount.$(O) IRStackCount.$(H): IRStackCount.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRTransformTest.$(O) IRTransformTest.$(H): IRTransformTest.st $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)cvut_stx_goodies_newcompiler.$(O) cvut_stx_goodies_newcompiler.$(H): cvut_stx_goodies_newcompiler.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRAccess.$(O) IRAccess.$(H): IRAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRClosure.$(O) IRClosure.$(H): IRClosure.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRConstant.$(O) IRConstant.$(H): IRConstant.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRDecompiler.$(O) IRDecompiler.$(H): IRDecompiler.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInterpreter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRDup.$(O) IRDup.$(H): IRDup.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRJump.$(O) IRJump.$(H): IRJump.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRLine.$(O) IRLine.$(H): IRLine.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRMethod.$(O) IRMethod.$(H): IRMethod.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRPop.$(O) IRPop.$(H): IRPop.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRPrinter.$(O) IRPrinter.$(H): IRPrinter.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInterpreter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRReturn.$(O) IRReturn.$(H): IRReturn.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRSend.$(O) IRSend.$(H): IRSend.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRTranslator.$(O) IRTranslator.$(H): IRTranslator.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInterpreter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRBlockReturnTop.$(O) IRBlockReturnTop.$(H): IRBlockReturnTop.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRReturn.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRInstVarAccess.$(O) IRInstVarAccess.$(H): IRInstVarAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRJumpIf.$(O) IRJumpIf.$(H): IRJumpIf.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRJump.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRJumpOverBlock.$(O) IRJumpOverBlock.$(H): IRJumpOverBlock.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRJump.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRLiteralVariableAccess.$(O) IRLiteralVariableAccess.$(H): IRLiteralVariableAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRTempAccess.$(O) IRTempAccess.$(H): IRTempAccess.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRInstVarRead.$(O) IRInstVarRead.$(H): IRInstVarRead.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstVarAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRInstVarStore.$(O) IRInstVarStore.$(H): IRInstVarStore.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstVarAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRLiteralVariableRead.$(O) IRLiteralVariableRead.$(H): IRLiteralVariableRead.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRLiteralVariableAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRLiteralVariableStore.$(O) IRLiteralVariableStore.$(H): IRLiteralVariableStore.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRLiteralVariableAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRTempRead.$(O) IRTempRead.$(H): IRTempRead.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRTempAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)IRTempStore.$(O) IRTempStore.$(H): IRTempStore.st $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRTempAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRAccess.$(H) $(INCLUDE_TOP)/cvut/stx/goodies/newcompiler/IRInstruction.$(H) $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libcomp/ByteCodeCompiler.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+

--- a/Make.spec	Mon Dec 28 15:09:00 2009 +0000
+++ b/Make.spec	Mon Dec 28 16:20:44 2009 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT 
-# automagically generated from the projectDefinition: stx_goodies_newcompiler.
+# automagically generated from the projectDefinition: cvut_stx_goodies_newcompiler.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -12,8 +12,8 @@
 # Do NOT CHANGE THESE DEFINITIONS
 # (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
 #  to find the source code of a class and to find the library for a package)
-MODULE=stx
-MODULE_DIR=goodies/newcompiler
+MODULE=cvut
+MODULE_DIR=stx/goodies/newcompiler
 PACKAGE=$(MODULE):$(MODULE_DIR)
 
 
@@ -49,15 +49,57 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard
 
+COMMON_CLASSES= \
+	IRBuilder \
+	IRBuilderTest \
+	IRBytecodeGenerator \
+	IRFunction \
+	IRInstruction \
+	IRInterpreter \
+	IRSequence \
+	IRStackCount \
+	IRTransformTest \
+	cvut_stx_goodies_newcompiler \
+	IRAccess \
+	IRClosure \
+	IRConstant \
+	IRDecompiler \
+	IRDup \
+	IRJump \
+	IRLine \
+	IRMethod \
+	IRPop \
+	IRPrinter \
+	IRReturn \
+	IRSend \
+	IRTranslator \
+	IRBlockReturnTop \
+	IRInstVarAccess \
+	IRJumpIf \
+	IRJumpOverBlock \
+	IRLiteralVariableAccess \
+	IRTempAccess \
+	IRInstVarRead \
+	IRInstVarStore \
+	IRLiteralVariableRead \
+	IRLiteralVariableStore \
+	IRTempRead \
+	IRTempStore \
+
+
+
+
 COMMON_OBJS= \
     $(OUTDIR)IRBuilder.$(O) \
+    $(OUTDIR)IRBuilderTest.$(O) \
     $(OUTDIR)IRBytecodeGenerator.$(O) \
     $(OUTDIR)IRFunction.$(O) \
     $(OUTDIR)IRInstruction.$(O) \
     $(OUTDIR)IRInterpreter.$(O) \
     $(OUTDIR)IRSequence.$(O) \
     $(OUTDIR)IRStackCount.$(O) \
-    $(OUTDIR)stx_goodies_newcompiler.$(O) \
+    $(OUTDIR)IRTransformTest.$(O) \
+    $(OUTDIR)cvut_stx_goodies_newcompiler.$(O) \
     $(OUTDIR)IRAccess.$(O) \
     $(OUTDIR)IRClosure.$(O) \
     $(OUTDIR)IRConstant.$(O) \
@@ -86,3 +128,4 @@
     $(OUTDIR)extensions.$(O) \
 
 
+

--- a/abbrev.stc	Mon Dec 28 15:09:00 2009 +0000
+++ b/abbrev.stc	Mon Dec 28 16:20:44 2009 +0000
@@ -1,35 +1,35 @@
-IRBuilder IRBuilder stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRBuilderTest IRBuilderTest stx:goodies/newcompiler 'NewCompiler-IR-Tests' 2
-IRBytecodeGenerator IRBytecodeGenerator stx:goodies/newcompiler 'NewCompiler-Bytecode' 0
-IRFunction IRFunction stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRInstruction IRInstruction stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRInterpreter IRInterpreter stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRSequence IRSequence stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRStackCount IRStackCount stx:goodies/newcompiler 'NewCompiler-Bytecode' 0
-IRTransformTest IRTransformTest stx:goodies/newcompiler 'NewCompiler-IR-Tests' 2
-stx_goodies_newcompiler stx_goodies_newcompiler stx:goodies/newcompiler '* Projects & Packages *' 2
-IRAccess IRAccess stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRClosure IRClosure stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRConstant IRConstant stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRDecompiler IRDecompiler stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRDup IRDup stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRJump IRJump stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRLine IRLine stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRMethod IRMethod stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRPop IRPop stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRPrinter IRPrinter stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRReturn IRReturn stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRSend IRSend stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRTranslator IRTranslator stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRBlockReturnTop IRBlockReturnTop stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRInstVarAccess IRInstVarAccess stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRJumpIf IRJumpIf stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRJumpOverBlock IRJumpOverBlock stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRLiteralVariableAccess IRLiteralVariableAccess stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRTempAccess IRTempAccess stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRInstVarRead IRInstVarRead stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRInstVarStore IRInstVarStore stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRLiteralVariableRead IRLiteralVariableRead stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRLiteralVariableStore IRLiteralVariableStore stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRTempRead IRTempRead stx:goodies/newcompiler 'NewCompiler-IR' 0
-IRTempStore IRTempStore stx:goodies/newcompiler 'NewCompiler-IR' 0
+IRBuilder IRBuilder cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRBuilderTest IRBuilderTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 2
+IRBytecodeGenerator IRBytecodeGenerator cvut:stx/goodies/newcompiler 'NewCompiler-Bytecode' 0
+IRFunction IRFunction cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRInstruction IRInstruction cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRInterpreter IRInterpreter cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRSequence IRSequence cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRStackCount IRStackCount cvut:stx/goodies/newcompiler 'NewCompiler-Bytecode' 0
+IRTransformTest IRTransformTest cvut:stx/goodies/newcompiler 'NewCompiler-IR-Tests' 2
+cvut_stx_goodies_newcompiler cvut_stx_goodies_newcompiler cvut:stx/goodies/newcompiler '* Projects & Packages *' 3
+IRAccess IRAccess cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRClosure IRClosure cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRConstant IRConstant cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRDecompiler IRDecompiler cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRDup IRDup cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRJump IRJump cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRLine IRLine cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRMethod IRMethod cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRPop IRPop cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRPrinter IRPrinter cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRReturn IRReturn cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRSend IRSend cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRTranslator IRTranslator cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRBlockReturnTop IRBlockReturnTop cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRInstVarAccess IRInstVarAccess cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRJumpIf IRJumpIf cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRJumpOverBlock IRJumpOverBlock cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRLiteralVariableAccess IRLiteralVariableAccess cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRTempAccess IRTempAccess cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRInstVarRead IRInstVarRead cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRInstVarStore IRInstVarStore cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRLiteralVariableRead IRLiteralVariableRead cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRLiteralVariableStore IRLiteralVariableStore cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRTempRead IRTempRead cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0
+IRTempStore IRTempStore cvut:stx/goodies/newcompiler 'NewCompiler-IR' 0

--- a/bc.mak	Mon Dec 28 15:09:00 2009 +0000
+++ b/bc.mak	Mon Dec 28 16:20:44 2009 +0000
@@ -28,7 +28,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcompat -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libtool
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -49,11 +49,15 @@
 	pushd ..\..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\libcompat & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\stx\libwidg3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\stx\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\..\stx\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 

--- a/cvut_stx_goodies_newcompiler.st	Mon Dec 28 15:09:00 2009 +0000
+++ b/cvut_stx_goodies_newcompiler.st	Mon Dec 28 16:20:44 2009 +0000
@@ -11,12 +11,21 @@
 !cvut_stx_goodies_newcompiler class methodsFor:'description'!
 
 preRequisites
+    "list all required packages.
+     This list can be maintained manually or (better) generated and
+     updated by scanning the superclass hierarchies and looking for
+     global variable accesses. (the browser has a menu function for that)
+     Howevery, often too much is found, and you may want to explicitely
+     exclude individual packages in the #excludedFromPrerequisites method."
+
     ^ #(
         #'stx:goodies/refactoryBrowser/parser'    "RBIdentifierToken - referenced by IRDecompiler>>newVar: "
+        #'stx:goodies/sunit'    "TestCase - superclass of IRTransformTest "
         #'stx:libbasic'    "Link - superclass of IRLine "
         #'stx:libbasic2'    "OrderedDictionary - referenced by IRBytecodeGenerator>>initialize "
         #'stx:libcomp'    "PrimitiveNode - referenced by IRFunction>>initialize "
         #'stx:libcompat'    "Preferences - referenced by IRDecompiler>>removeClosureCreation: "
+        #'stx:libtool'    "Tools::Inspector2Tab - referenced by IRFunction>>inspector2TabIRCode "
         #'stx:libwidg'    "ScrollableView - referenced by IRFunction>>inspector2TabIRCode "
     )
 ! !
@@ -24,6 +33,11 @@
 !cvut_stx_goodies_newcompiler class methodsFor:'description - contents'!
 
 classNamesAndAttributes
+    "lists the classes which are to be included in the project.
+     Each entry in the list may be: a single class-name (symbol),
+     or an array-literal consisting of class name and attributes.
+     Attributes are: #autoload or #<os> where os is one of win32, unix,..."
+
     ^ #(
         "<className> or (<className> attributes...) in load order"
         IRBuilder
@@ -65,6 +79,9 @@
 !
 
 extensionMethodNames
+    "lists the extension methods which are to be included in the project.
+     Entries are 2-element array literals, consisting of class-name and selector."
+
     ^ #(
         ByteCodeCompiler literalArray:
         Class binding
@@ -112,7 +129,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"nil"$"
+    ^ "$SVN-Revision:"'27'"$"
 ! !
 
 !cvut_stx_goodies_newcompiler class methodsFor:'documentation'!

--- a/libInit.cc	Mon Dec 28 15:09:00 2009 +0000
+++ b/libInit.cc	Mon Dec 28 16:20:44 2009 +0000
@@ -1,31 +1,33 @@
 /*
  * $Header$
  *
- * DO NOT EDIT 
- * automagically generated from the projectDefinition: stx_goodies_newcompiler.
+ * DO NOT EDIT
+ * automagically generated from the projectDefinition: cvut_stx_goodies_newcompiler.
  */
 #define __INDIRECTVMINITCALLS__
 #include <stc.h>
 
 #ifdef WIN32
 # pragma codeseg INITCODE "INITCODE"
-#endif 
+#endif
 
 #if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
-DLL_EXPORT void _libstx_goodies_newcompiler_Init() INIT_TEXT_SECTION;
+DLL_EXPORT void _libcvut_stx_goodies_newcompiler_Init() INIT_TEXT_SECTION;
 #endif
 
-void _libstx_goodies_newcompiler_Init(pass, __pRT__, snd)
+void _libcvut_stx_goodies_newcompiler_Init(pass, __pRT__, snd)
 OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_goodies_newcompiler", _libstx_goodies_newcompiler_Init, "stx:goodies/newcompiler");
+__BEGIN_PACKAGE2__("libcvut_stx_goodies_newcompiler", _libcvut_stx_goodies_newcompiler_Init, "cvut:stx/goodies/newcompiler");
 _IRBuilder_Init(pass,__pRT__,snd);
+_IRBuilderTest_Init(pass,__pRT__,snd);
 _IRBytecodeGenerator_Init(pass,__pRT__,snd);
 _IRFunction_Init(pass,__pRT__,snd);
 _IRInstruction_Init(pass,__pRT__,snd);
 _IRInterpreter_Init(pass,__pRT__,snd);
 _IRSequence_Init(pass,__pRT__,snd);
 _IRStackCount_Init(pass,__pRT__,snd);
-_stx_137goodies_137newcompiler_Init(pass,__pRT__,snd);
+_IRTransformTest_Init(pass,__pRT__,snd);
+_cvut_137stx_137goodies_137newcompiler_Init(pass,__pRT__,snd);
 _IRAccess_Init(pass,__pRT__,snd);
 _IRClosure_Init(pass,__pRT__,snd);
 _IRConstant_Init(pass,__pRT__,snd);
@@ -52,6 +54,6 @@
 _IRTempRead_Init(pass,__pRT__,snd);
 _IRTempStore_Init(pass,__pRT__,snd);
 
-_stx_137goodies_137newcompiler_extensions_Init(pass,__pRT__,snd);
+_cvut_137stx_137goodies_137newcompiler_extensions_Init(pass,__pRT__,snd);
 __END_PACKAGE__();
 }

--- a/newcompiler.rc	Mon Dec 28 15:09:00 2009 +0000
+++ b/newcompiler.rc	Mon Dec 28 16:20:44 2009 +0000
@@ -23,7 +23,7 @@
       VALUE "LegalCopyright", "Copyright Jan Vrany & Mathieu Suen 2008\0"
       VALUE "ProductName", "NewCompiler\0"
       VALUE "ProductVersion", "5.4.6.1\0"
-      VALUE "ProductDate", "Mon, 28 Dec 2009 15:07:31 GMT\0"
+      VALUE "ProductDate", "Mon, 28 Dec 2009 16:19:18 GMT\0"
     END
 
   END