--- a/analyzer/tests/Make.proto Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/Make.proto Mon Apr 13 14:16:24 2015 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/petitparser/analyzer -I$(INCLUDE_TOP)/stx/goodies/petitparser/tests -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
# if you need any additional defines for embedded C code,
@@ -102,11 +102,18 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
cd ../../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../tests && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
# build all packages containing referenced classes for this package
-# they are nor needed to compile the package
+# they are not needed to compile the package (but later, to load it)
references:
@@ -121,6 +128,9 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)PPAnalyzerTest.$(O) PPAnalyzerTest.$(H): PPAnalyzerTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPRewriterTest.$(O) PPRewriterTest.$(H): PPRewriterTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)PPSearcherTest.$(O) PPSearcherTest.$(H): PPSearcherTest.st $(INCLUDE_TOP)/stx/goodies/petitparser/tests/PPAbstractParserTest.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)stx_goodies_petitparser_analyzer_tests.$(O) stx_goodies_petitparser_analyzer_tests.$(H): stx_goodies_petitparser_analyzer_tests.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/analyzer/tests/Make.spec Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/Make.spec Mon Apr 13 14:16:24 2015 +0100
@@ -51,12 +51,18 @@
STCWARNINGS=-warnNonStandard
COMMON_CLASSES= \
+ PPAnalyzerTest \
+ PPRewriterTest \
+ PPSearcherTest \
stx_goodies_petitparser_analyzer_tests \
COMMON_OBJS= \
+ $(OUTDIR_SLASH)PPAnalyzerTest.$(O) \
+ $(OUTDIR_SLASH)PPRewriterTest.$(O) \
+ $(OUTDIR_SLASH)PPSearcherTest.$(O) \
$(OUTDIR_SLASH)stx_goodies_petitparser_analyzer_tests.$(O) \
--- a/analyzer/tests/PPAnalyzerTest.st Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/PPAnalyzerTest.st Mon Apr 13 14:16:24 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/analyzer/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPAbstractParserTest subclass:#PPAnalyzerTest
instanceVariableNames:''
classVariableNames:''
--- a/analyzer/tests/PPRewriterTest.st Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/PPRewriterTest.st Mon Apr 13 14:16:24 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/analyzer/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPAbstractParserTest subclass:#PPRewriterTest
instanceVariableNames:'rewriter'
classVariableNames:''
--- a/analyzer/tests/PPSearcherTest.st Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/PPSearcherTest.st Mon Apr 13 14:16:24 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/analyzer/tests' }"
+"{ NameSpace: Smalltalk }"
+
PPAbstractParserTest subclass:#PPSearcherTest
instanceVariableNames:'searcher'
classVariableNames:''
--- a/analyzer/tests/abbrev.stc Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/abbrev.stc Mon Apr 13 14:16:24 2015 +0100
@@ -1,7 +1,7 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
-stx_goodies_petitparser_analyzer_tests stx_goodies_petitparser_analyzer_tests stx:goodies/petitparser/analyzer/tests '* Projects & Packages *' 3
PPAnalyzerTest PPAnalyzerTest stx:goodies/petitparser/analyzer/tests 'PetitAnalyzer-Tests' 1
PPRewriterTest PPRewriterTest stx:goodies/petitparser/analyzer/tests 'PetitAnalyzer-Tests' 1
PPSearcherTest PPSearcherTest stx:goodies/petitparser/analyzer/tests 'PetitAnalyzer-Tests' 1
+stx_goodies_petitparser_analyzer_tests stx_goodies_petitparser_analyzer_tests stx:goodies/petitparser/analyzer/tests '* Projects & Packages *' 3
--- a/analyzer/tests/bc.mak Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/bc.mak Mon Apr 13 14:16:24 2015 +0100
@@ -35,7 +35,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\goodies\petitparser\analyzer -I$(INCLUDE_TOP)\stx\goodies\petitparser\tests -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -52,6 +52,13 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\tests & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -68,6 +75,9 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)PPAnalyzerTest.$(O) PPAnalyzerTest.$(H): PPAnalyzerTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPRewriterTest.$(O) PPRewriterTest.$(H): PPRewriterTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)PPSearcherTest.$(O) PPSearcherTest.$(H): PPSearcherTest.st $(INCLUDE_TOP)\stx\goodies\petitparser\tests\PPAbstractParserTest.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)stx_goodies_petitparser_analyzer_tests.$(O) stx_goodies_petitparser_analyzer_tests.$(H): stx_goodies_petitparser_analyzer_tests.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/analyzer/tests/libInit.cc Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/libInit.cc Mon Apr 13 14:16:24 2015 +0100
@@ -27,6 +27,9 @@
void _libstx_goodies_petitparser_analyzer_tests_Init(pass, __pRT__, snd)
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libstx_goodies_petitparser_analyzer_tests", _libstx_goodies_petitparser_analyzer_tests_Init, "stx:goodies/petitparser/analyzer/tests");
+_PPAnalyzerTest_Init(pass,__pRT__,snd);
+_PPRewriterTest_Init(pass,__pRT__,snd);
+_PPSearcherTest_Init(pass,__pRT__,snd);
_stx_137goodies_137petitparser_137analyzer_137tests_Init(pass,__pRT__,snd);
--- a/analyzer/tests/stx_goodies_petitparser_analyzer_tests.st Mon Nov 24 21:44:56 2014 +0000
+++ b/analyzer/tests/stx_goodies_petitparser_analyzer_tests.st Mon Apr 13 14:16:24 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'stx:goodies/petitparser/analyzer/tests' }"
+"{ NameSpace: Smalltalk }"
+
LibraryDefinition subclass:#stx_goodies_petitparser_analyzer_tests
instanceVariableNames:''
classVariableNames:''
@@ -52,18 +54,25 @@
by searching along the inheritance chain of all of my classes."
^ #(
- #'stx:libbasic' "Autoload - superclass of PPAnalyzerTest"
+ #'stx:goodies/petitparser/tests' "PPAbstractParserTest - superclass of PPAnalyzerTest"
+ #'stx:goodies/sunit' "TestAsserter - superclass of PPAnalyzerTest"
+ #'stx:libbasic' "LibraryDefinition - superclass of stx_goodies_petitparser_analyzer_tests"
)
!
referencedPreRequisites
"list packages which are a prerequisite, because they contain
classes which are referenced by my classes.
- We do not need these packages as a prerequisite for loading or compiling.
+ We do not need these packages as a prerequisite for compiling or loading,
+ however, a class from it may be referenced during execution and having it
+ unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
+ includes explicit checks for the package being present.
This method is generated automatically,
by searching all classes (and their packages) which are referenced by my classes."
^ #(
+ #'stx:goodies/petitparser' "PPAndParser - referenced by PPAnalyzerTest>>testIsNullable"
+ #'stx:goodies/petitparser/analyzer' "PPListPattern - referenced by PPRewriterTest>>testDuplicationRemoval"
)
!
@@ -87,10 +96,10 @@
^ #(
"<className> or (<className> attributes...) in load order"
+ PPAnalyzerTest
+ PPRewriterTest
+ PPSearcherTest
#'stx_goodies_petitparser_analyzer_tests'
- (PPAnalyzerTest autoload)
- (PPRewriterTest autoload)
- (PPSearcherTest autoload)
)
!