# HG changeset patch # User Jan Vrany # Date 1412297950 -3600 # Node ID a2656b27cacee9507cdca29b0b474c50f64add00 # Parent e2b2f08d054e9677249b2ed2308912e3e6dc9355 Added monticelloName to package definition to ease export to .mcz diff -r e2b2f08d054e -r a2656b27cace Make.proto --- a/Make.proto Fri Oct 03 01:36:33 2014 +0100 +++ b/Make.proto Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/Make.proto,v 1.6 2014-03-04 20:30:38 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser. @@ -92,12 +92,19 @@ +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**')) +stx_goodies_petitparser.$(O): $(shell hg root)/.hg/dirstate +endif + # run default testsuite for this package test: $(TOP)/goodies/builder/reports - $(MAKE) -C $(TOP)/goodies/builder/reports + $(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE) @@ -118,6 +125,7 @@ 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 ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" @@ -172,8 +180,6 @@ $(OUTDIR)PPRepeatingParser.$(O) PPRepeatingParser.$(H): PPRepeatingParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)PPSequenceParser.$(O) PPSequenceParser.$(H): PPSequenceParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPListParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)PPTrimmingParser.$(O) PPTrimmingParser.$(H): PPTrimmingParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)PPArithmeticParser.$(O) PPArithmeticParser.$(H): PPArithmeticParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)PPLambdaParser.$(O) PPLambdaParser.$(H): PPLambdaParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)PPLimitedRepeatingParser.$(O) PPLimitedRepeatingParser.$(H): PPLimitedRepeatingParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPRepeatingParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)PPPossessiveRepeatingParser.$(O) PPPossessiveRepeatingParser.$(H): PPPossessiveRepeatingParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPRepeatingParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)PPTokenParser.$(O) PPTokenParser.$(H): PPTokenParser.st $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPFlattenParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) diff -r e2b2f08d054e -r a2656b27cace Make.spec --- a/Make.spec Fri Oct 03 01:36:33 2014 +0100 +++ b/Make.spec Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/Make.spec,v 1.9 2014-03-04 20:30:37 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser. diff -r e2b2f08d054e -r a2656b27cace PPAndParser.st --- a/PPAndParser.st Fri Oct 03 01:36:33 2014 +0100 +++ b/PPAndParser.st Fri Oct 03 01:59:10 2014 +0100 @@ -34,6 +34,12 @@ ^ '$Header: /cvs/stx/stx/goodies/petitparser/PPAndParser.st,v 1.3 2012-05-04 22:08:57 vrany Exp $' ! +version_HG + + ^ '$Changeset: $' +! + version_SVN ^ '§Id: PPAndParser.st 2 2010-12-17 18:44:23Z vranyj1 §' ! ! + diff -r e2b2f08d054e -r a2656b27cace PPCompositeParserTest.st --- a/PPCompositeParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -"{ Package: 'stx:goodies/petitparser' }" - -PPAbstractParseTest subclass:#PPCompositeParserTest - instanceVariableNames:'parser result' - classVariableNames:'' - poolDictionaries:'' - category:'PetitTests-Core' -! - - -!PPCompositeParserTest class methodsFor:'accessing'! - -resources - ^ Array with: PPParserResource -! ! - -!PPCompositeParserTest class methodsFor:'testing'! - -isAbstract - ^ self name = #PPCompositeParserTest -! ! - -!PPCompositeParserTest methodsFor:'accessing'! - -parserClass - self subclassResponsibility -! - -parserInstance - ^ PPParserResource current parserAt: self parserClass -! ! - -!PPCompositeParserTest methodsFor:'parsing'! - -fail: aString rule: aSymbol - | production | - production := self parserInstance - productionAt: aSymbol. - result := production end - parse: aString. - self - assert: result isPetitFailure - description: 'Able to parse ' , aString printString. - ^ result -! - -parse: aString - ^ self parse: aString rule: #start -! - -parse: aString rule: aSymbol - | production | - production := self parserInstance. - aSymbol = #start - ifFalse: [ production := production productionAt: aSymbol ]. - result := production parse: aString. - self - deny: result isPetitFailure - description: 'Unable to parse ' , aString printString - resumable: true. - ^ result -! ! - -!PPCompositeParserTest methodsFor:'running'! - -setUp - super setUp. - parser := self parserInstance -! - -tearDown - super tearDown. - parser := result := nil -! ! - -!PPCompositeParserTest methodsFor:'utilities'! - -assert: aCollection is: anObject - self parse: aCollection. - self - assert: result = anObject - description: 'Got: ' , result printString , '; Expected: ' , anObject printString - resumable: true -! ! - -!PPCompositeParserTest class methodsFor:'documentation'! - -version_SVN - ^ '$Id: PPCompositeParserTest.st,v 1.2 2012-01-13 11:22:50 cg Exp $' -! ! diff -r e2b2f08d054e -r a2656b27cace analyzer/Make.proto --- a/analyzer/Make.proto Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/Make.proto Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/analyzer/Make.proto,v 1.4 2014-03-04 20:29:31 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_analyzer. @@ -70,12 +70,19 @@ +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**')) +stx_goodies_petitparser_analyzer.$(O): $(shell hg root)/.hg/dirstate +endif + # run default testsuite for this package test: $(TOP)/goodies/builder/reports - $(MAKE) -C $(TOP)/goodies/builder/reports + $(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE) @@ -96,6 +103,7 @@ 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 ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" diff -r e2b2f08d054e -r a2656b27cace analyzer/Make.spec --- a/analyzer/Make.spec Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/Make.spec Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/analyzer/Make.spec,v 1.4 2014-03-04 20:29:30 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_analyzer. diff -r e2b2f08d054e -r a2656b27cace analyzer/PPReplaceRule.st --- a/analyzer/PPReplaceRule.st Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/PPReplaceRule.st Fri Oct 03 01:59:10 2014 +0100 @@ -33,5 +33,10 @@ version_CVS ^ '$Header: /cvs/stx/stx/goodies/petitparser/analyzer/PPReplaceRule.st,v 1.2 2014-03-04 20:27:53 cg Exp $' +! + +version_HG + + ^ '$Changeset: $' ! ! diff -r e2b2f08d054e -r a2656b27cace analyzer/analyzer.rc --- a/analyzer/analyzer.rc Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/analyzer.rc Fri Oct 03 01:59:10 2014 +0100 @@ -3,8 +3,8 @@ // automagically generated from the projectDefinition: stx_goodies_petitparser_analyzer. // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,2,1,5 - PRODUCTVERSION 6,2,3,0 + FILEVERSION 6,2,32767,32767 + PRODUCTVERSION 6,2,4,0 #if (__BORLANDC__) FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD @@ -20,12 +20,12 @@ BEGIN VALUE "CompanyName", "eXept Software AG\0" VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0" - VALUE "FileVersion", "6.2.1.5\0" + VALUE "FileVersion", "6.2.32767.32767\0" VALUE "InternalName", "stx:goodies/petitparser/analyzer\0" VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2014\nCopyright eXept Software AG 1998-2014\0" VALUE "ProductName", "Smalltalk/X\0" - VALUE "ProductVersion", "6.2.3.0\0" - VALUE "ProductDate", "Tue, 04 Mar 2014 20:29:28 GMT\0" + VALUE "ProductVersion", "6.2.4.0\0" + VALUE "ProductDate", "Fri, 03 Oct 2014 00:58:06 GMT\0" END END diff -r e2b2f08d054e -r a2656b27cace analyzer/bc.mak --- a/analyzer/bc.mak Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/bc.mak Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/analyzer/bc.mak,v 1.4 2014-03-04 20:29:33 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_analyzer. @@ -52,6 +52,7 @@ 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 ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -87,3 +88,12 @@ $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPActionParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPEpsilonParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPFailingParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPFlattenParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPLimitedRepeatingParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPListParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPLiteralParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPOptionalParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPPluggableParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPPredicateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPPredicateSequenceParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPRepeatingParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPSequenceParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPTokenParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line + +# **Must be at end** + +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +!IFDEF HGROOT +$(OUTDIR)stx_goodies_petitparser_analyzer.$(O): $(HGROOT)\.hg\dirstate +!ENDIF diff -r e2b2f08d054e -r a2656b27cace analyzer/extensions.st --- a/analyzer/extensions.st Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/extensions.st Fri Oct 03 01:59:10 2014 +0100 @@ -520,6 +520,7 @@ !stx_goodies_petitparser_analyzer class methodsFor:'documentation'! -extensionsVersion_CVS - ^ '$Header: /cvs/stx/stx/goodies/petitparser/analyzer/extensions.st,v 1.4 2014-03-04 20:27:43 cg Exp $' +extensionsVersion_HG + + ^ '$Changeset: $' ! ! diff -r e2b2f08d054e -r a2656b27cace analyzer/libInit.cc --- a/analyzer/libInit.cc Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/libInit.cc Fri Oct 03 01:59:10 2014 +0100 @@ -1,5 +1,5 @@ /* - * $Header: /cvs/stx/stx/goodies/petitparser/analyzer/libInit.cc,v 1.4 2014-03-04 20:29:42 cg Exp $ + * $Header$ * * DO NOT EDIT * automagically generated from the projectDefinition: stx_goodies_petitparser_analyzer. diff -r e2b2f08d054e -r a2656b27cace analyzer/stx_goodies_petitparser_analyzer.st --- a/analyzer/stx_goodies_petitparser_analyzer.st Fri Oct 03 01:36:33 2014 +0100 +++ b/analyzer/stx_goodies_petitparser_analyzer.st Fri Oct 03 01:59:10 2014 +0100 @@ -8,6 +8,16 @@ ! +!stx_goodies_petitparser_analyzer class methodsFor:'accessing - monticello'! + +monticelloName + "Return name of the package for Monticello. This is used when package is exported" + + ^ 'PetitAnalyzer' + + "Created: / 03-10-2014 / 01:48:26 / Jan Vrany " +! ! + !stx_goodies_petitparser_analyzer class methodsFor:'description'! excludedFromPreRequisites @@ -171,6 +181,10 @@ ^ '$Header: /cvs/stx/stx/goodies/petitparser/analyzer/stx_goodies_petitparser_analyzer.st,v 1.6 2014-03-04 20:29:43 cg Exp $' ! +version_HG + ^ '$Changeset: $' +! + version_MC ^ '$PetitAnalyzer-lr.41 608069e1-dadc-4435-abd6-995adf7519e2 2013-03-16T21:52:20 lr$' ! ! diff -r e2b2f08d054e -r a2656b27cace bc.mak --- a/bc.mak Fri Oct 03 01:36:33 2014 +0100 +++ b/bc.mak Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/bc.mak,v 1.9 2014-03-04 20:30:40 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser. @@ -52,6 +52,7 @@ 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 ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -103,8 +104,6 @@ $(OUTDIR)PPRepeatingParser.$(O) PPRepeatingParser.$(H): PPRepeatingParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)PPSequenceParser.$(O) PPSequenceParser.$(H): PPSequenceParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPListParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)PPTrimmingParser.$(O) PPTrimmingParser.$(H): PPTrimmingParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)PPArithmeticParser.$(O) PPArithmeticParser.$(H): PPArithmeticParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)PPLambdaParser.$(O) PPLambdaParser.$(H): PPLambdaParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)PPLimitedRepeatingParser.$(O) PPLimitedRepeatingParser.$(H): PPLimitedRepeatingParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPRepeatingParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)PPPossessiveRepeatingParser.$(O) PPPossessiveRepeatingParser.$(H): PPPossessiveRepeatingParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPRepeatingParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)PPTokenParser.$(O) PPTokenParser.$(H): PPTokenParser.st $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPFlattenParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -114,3 +113,12 @@ $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\BlockContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\Context.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Interval.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(STCHDR) # ENDMAKEDEPEND --- do not remove this line + +# **Must be at end** + +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +!IFDEF HGROOT +$(OUTDIR)stx_goodies_petitparser.$(O): $(HGROOT)\.hg\dirstate +!ENDIF diff -r e2b2f08d054e -r a2656b27cace extensions.st --- a/extensions.st Fri Oct 03 01:36:33 2014 +0100 +++ b/extensions.st Fri Oct 03 01:59:10 2014 +0100 @@ -164,7 +164,7 @@ !stx_goodies_petitparser class methodsFor:'documentation'! -extensionsVersion_CVS - ^ '$Header: /cvs/stx/stx/goodies/petitparser/extensions.st,v 1.12 2014-03-04 20:29:55 cg Exp $' +extensionsVersion_HG + + ^ '$Changeset: $' ! ! - diff -r e2b2f08d054e -r a2656b27cace libInit.cc --- a/libInit.cc Fri Oct 03 01:36:33 2014 +0100 +++ b/libInit.cc Fri Oct 03 01:59:10 2014 +0100 @@ -1,5 +1,5 @@ /* - * $Header: /cvs/stx/stx/goodies/petitparser/libInit.cc,v 1.7 2014-03-04 20:30:47 cg Exp $ + * $Header$ * * DO NOT EDIT * automagically generated from the projectDefinition: stx_goodies_petitparser. diff -r e2b2f08d054e -r a2656b27cace mingwmake.bat diff -r e2b2f08d054e -r a2656b27cace petitparser.rc --- a/petitparser.rc Fri Oct 03 01:36:33 2014 +0100 +++ b/petitparser.rc Fri Oct 03 01:59:10 2014 +0100 @@ -3,8 +3,8 @@ // automagically generated from the projectDefinition: stx_goodies_petitparser. // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,2,1,14 - PRODUCTVERSION 6,2,3,0 + FILEVERSION 6,2,32767,32767 + PRODUCTVERSION 6,2,4,0 #if (__BORLANDC__) FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD @@ -20,12 +20,12 @@ BEGIN VALUE "CompanyName", "Lukas Renggli & SWING Research Group\0" VALUE "FileDescription", "Smalltalk/X Scannerless Parser & Parser Combinator Library (LIB)\0" - VALUE "FileVersion", "6.2.1.14\0" + VALUE "FileVersion", "6.2.32767.32767\0" VALUE "InternalName", "stx:goodies/petitparser\0" VALUE "LegalCopyright", "(C) Lukas Renggli\0" VALUE "ProductName", "Petit Parser\0" - VALUE "ProductVersion", "6.2.3.0\0" - VALUE "ProductDate", "Tue, 04 Mar 2014 20:30:36 GMT\0" + VALUE "ProductVersion", "6.2.4.0\0" + VALUE "ProductDate", "Fri, 03 Oct 2014 00:58:02 GMT\0" END END diff -r e2b2f08d054e -r a2656b27cace stx_goodies_petitparser.st --- a/stx_goodies_petitparser.st Fri Oct 03 01:36:33 2014 +0100 +++ b/stx_goodies_petitparser.st Fri Oct 03 01:59:10 2014 +0100 @@ -18,6 +18,16 @@ "Created: / 17-12-2010 / 19:44:58 / Jan Vrany " ! ! +!stx_goodies_petitparser class methodsFor:'accessing - monticello'! + +monticelloName + "Return name of the package for Monticello. This is used when package is exported" + + ^ 'PetitParser' + + "Created: / 03-10-2014 / 01:47:26 / Jan Vrany " +! ! + !stx_goodies_petitparser class methodsFor:'accessing - tests'! testSuite @@ -248,8 +258,6 @@ !stx_goodies_petitparser class methodsFor:'documentation'! -!stx_goodies_petitparser class methodsFor:'documentation'! - version ^ '$Header: /cvs/stx/stx/goodies/petitparser/stx_goodies_petitparser.st,v 1.15 2014-03-04 20:30:48 cg Exp $' ! @@ -258,6 +266,10 @@ ^ '$Header: /cvs/stx/stx/goodies/petitparser/stx_goodies_petitparser.st,v 1.15 2014-03-04 20:30:48 cg Exp $' ! +version_HG + ^ '$Changeset: $' +! + version_MC ^ '$PetitParser-lr.231 a18ceb3c-e6d2-4b74-91c9-33f05d2e0514 2013-03-16T21:51:30 lr$' ! diff -r e2b2f08d054e -r a2656b27cace tests/Make.proto --- a/tests/Make.proto Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/Make.proto Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/tests/Make.proto,v 1.2 2014-03-04 20:31:54 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_tests. @@ -34,7 +34,7 @@ # add the path(es) here:, # ********** OPTIONAL: MODIFY the next lines *** # LOCALINCLUDES=-Ifoo -Ibar -LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic +LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic # if you need any additional defines for embedded C code, @@ -70,12 +70,19 @@ +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**')) +stx_goodies_petitparser_tests.$(O): $(shell hg root)/.hg/dirstate +endif + # run default testsuite for this package test: $(TOP)/goodies/builder/reports - $(MAKE) -C $(TOP)/goodies/builder/reports + $(MAKE) -C $(TOP)/goodies/builder/reports -f Makefile.init $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE) @@ -96,6 +103,7 @@ 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 ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" cd ../../sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)" @@ -118,9 +126,7 @@ # BEGINMAKEDEPEND --- do not remove this line; make depend needs it -$(OUTDIR)PPAbstractParserTest.$(O) PPAbstractParserTest.$(H): PPAbstractParserTest.st $(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_tests.$(O) stx_goodies_petitparser_tests.$(H): stx_goodies_petitparser_tests.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR) -$(OUTDIR)PPCompositeParserTest.$(O) PPCompositeParserTest.$(H): PPCompositeParserTest.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) # ENDMAKEDEPEND --- do not remove this line diff -r e2b2f08d054e -r a2656b27cace tests/Make.spec --- a/tests/Make.spec Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/Make.spec Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/tests/Make.spec,v 1.2 2014-03-04 20:31:53 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_tests. @@ -50,17 +50,13 @@ STCWARNINGS=-warnNonStandard COMMON_CLASSES= \ - PPAbstractParserTest \ stx_goodies_petitparser_tests \ - PPCompositeParserTest \ COMMON_OBJS= \ - $(OUTDIR_SLASH)PPAbstractParserTest.$(O) \ $(OUTDIR_SLASH)stx_goodies_petitparser_tests.$(O) \ - $(OUTDIR_SLASH)PPCompositeParserTest.$(O) \ diff -r e2b2f08d054e -r a2656b27cace tests/PPAbstractParseTest.st --- a/tests/PPAbstractParseTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPAbstractParseTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" TestCase subclass:#PPAbstractParseTest instanceVariableNames:'' @@ -95,3 +95,4 @@ version_SVN ^ '§Id: PPAbstractParseTest.st 4 2010-12-18 17:02:23Z kursjan §' ! ! + diff -r e2b2f08d054e -r a2656b27cace tests/PPArithmeticParser.st --- a/tests/PPArithmeticParser.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPArithmeticParser.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPCompositeParser subclass:#PPArithmeticParser instanceVariableNames:'terms addition factors multiplication power primary parentheses diff -r e2b2f08d054e -r a2656b27cace tests/PPArithmeticParserTest.st --- a/tests/PPArithmeticParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPArithmeticParserTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPCompositeParserTest subclass:#PPArithmeticParserTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPComposedTest.st --- a/tests/PPComposedTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPComposedTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPComposedTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPCompositeParserTest.st --- a/tests/PPCompositeParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPCompositeParserTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -97,6 +97,11 @@ ^ '$Header: /cvs/stx/stx/goodies/petitparser/tests/PPCompositeParserTest.st,v 1.2 2014-03-04 20:31:51 cg Exp $' ! +version_HG + + ^ '$Changeset: $' +! + version_SVN ^ '$Id: PPCompositeParserTest.st,v 1.2 2014-03-04 20:31:51 cg Exp $' ! ! diff -r e2b2f08d054e -r a2656b27cace tests/PPExpressionParserTest.st --- a/tests/PPExpressionParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPExpressionParserTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPArithmeticParserTest subclass:#PPExpressionParserTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPExtensionTest.st --- a/tests/PPExtensionTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPExtensionTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPExtensionTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPLambdaParser.st --- a/tests/PPLambdaParser.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPLambdaParser.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPCompositeParser subclass:#PPLambdaParser instanceVariableNames:'expression abstraction application variable' diff -r e2b2f08d054e -r a2656b27cace tests/PPLambdaParserTest.st --- a/tests/PPLambdaParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPLambdaParserTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPCompositeParserTest subclass:#PPLambdaParserTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPMappingTest.st --- a/tests/PPMappingTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPMappingTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParseTest subclass:#PPMappingTest instanceVariableNames:'' @@ -91,3 +91,4 @@ version_SVN ^ '§Id: PPMappingTest.st 4 2010-12-18 17:02:23Z kursjan §' ! ! + diff -r e2b2f08d054e -r a2656b27cace tests/PPObjectTest.st --- a/tests/PPObjectTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPObjectTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPObjectTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPParserResource.st --- a/tests/PPParserResource.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPParserResource.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" TestResource subclass:#PPParserResource instanceVariableNames:'parsers' @@ -36,3 +36,4 @@ version_SVN ^ '§Id: PPParserResource.st 4 2010-12-18 17:02:23Z kursjan §' ! ! + diff -r e2b2f08d054e -r a2656b27cace tests/PPParserTest.st --- a/tests/PPParserTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPParserTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPParserTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPPredicateTest.st --- a/tests/PPPredicateTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPPredicateTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPPredicateTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPScriptingTest.st --- a/tests/PPScriptingTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPScriptingTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPScriptingTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/PPTokenTest.st --- a/tests/PPTokenTest.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/PPTokenTest.st Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -"{ Package: 'stx:goodies/petitparser' }" +"{ Package: 'stx:goodies/petitparser/tests' }" PPAbstractParserTest subclass:#PPTokenTest instanceVariableNames:'' diff -r e2b2f08d054e -r a2656b27cace tests/abbrev.stc --- a/tests/abbrev.stc Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/abbrev.stc Fri Oct 03 01:59:10 2014 +0100 @@ -4,3 +4,18 @@ PPAbstractParserTest PPAbstractParserTest stx:goodies/petitparser/tests 'PetitTests-Core' 1 stx_goodies_petitparser_tests stx_goodies_petitparser_tests stx:goodies/petitparser/tests '* Projects & Packages *' 3 PPCompositeParserTest PPCompositeParserTest stx:goodies/petitparser/tests 'PetitTests-Core' 1 +PPAbstractParseTest PPAbstractParseTest stx:goodies/petitparser/tests 'PetitTests-Core' 1 +PPArithmeticParserTest PPArithmeticParserTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPComposedTest PPComposedTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPExtensionTest PPExtensionTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPLambdaParserTest PPLambdaParserTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPObjectTest PPObjectTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPParserResource PPParserResource stx:goodies/petitparser/tests 'PetitTests-Core' 1 +PPParserTest PPParserTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPPredicateTest PPPredicateTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPScriptingTest PPScriptingTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPTokenTest PPTokenTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPExpressionParserTest PPExpressionParserTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPMappingTest PPMappingTest stx:goodies/petitparser/tests 'PetitTests-Tests' 1 +PPArithmeticParser PPArithmeticParser stx:goodies/petitparser/tests 'PetitTests-Examples' 0 +PPLambdaParser PPLambdaParser stx:goodies/petitparser/tests 'PetitTests-Examples' 0 diff -r e2b2f08d054e -r a2656b27cace tests/bc.mak --- a/tests/bc.mak Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/bc.mak Fri Oct 03 01:59:10 2014 +0100 @@ -1,4 +1,4 @@ -# $Header: /cvs/stx/stx/goodies/petitparser/tests/bc.mak,v 1.2 2014-03-04 20:31:57 cg Exp $ +# $Header$ # # DO NOT EDIT # automagically generated from the projectDefinition: stx_goodies_petitparser_tests. @@ -34,7 +34,7 @@ -LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic +LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\petitparser -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,7 @@ 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 ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " pushd ..\..\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) " @@ -71,8 +72,15 @@ # BEGINMAKEDEPEND --- do not remove this line; make depend needs it -$(OUTDIR)PPAbstractParserTest.$(O) PPAbstractParserTest.$(H): PPAbstractParserTest.st $(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_tests.$(O) stx_goodies_petitparser_tests.$(H): stx_goodies_petitparser_tests.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR) -$(OUTDIR)PPCompositeParserTest.$(O) PPCompositeParserTest.$(H): PPCompositeParserTest.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) # ENDMAKEDEPEND --- do not remove this line + +# **Must be at end** + +# Enforce recompilation of package definition class if Mercurial working +# copy state changes. Together with --guessVersion it ensures that package +# definition class always contains correct binary revision string. +!IFDEF HGROOT +$(OUTDIR)stx_goodies_petitparser_tests.$(O): $(HGROOT)\.hg\dirstate +!ENDIF diff -r e2b2f08d054e -r a2656b27cace tests/libInit.cc --- a/tests/libInit.cc Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/libInit.cc Fri Oct 03 01:59:10 2014 +0100 @@ -1,5 +1,5 @@ /* - * $Header: /cvs/stx/stx/goodies/petitparser/tests/libInit.cc,v 1.2 2014-03-04 20:32:05 cg Exp $ + * $Header$ * * DO NOT EDIT * automagically generated from the projectDefinition: stx_goodies_petitparser_tests. @@ -27,9 +27,7 @@ void _libstx_goodies_petitparser_tests_Init(pass, __pRT__, snd) OBJ snd; struct __vmData__ *__pRT__; { __BEGIN_PACKAGE2__("libstx_goodies_petitparser_tests", _libstx_goodies_petitparser_tests_Init, "stx:goodies/petitparser/tests"); -_PPAbstractParserTest_Init(pass,__pRT__,snd); _stx_137goodies_137petitparser_137tests_Init(pass,__pRT__,snd); -_PPCompositeParserTest_Init(pass,__pRT__,snd); __END_PACKAGE__(); diff -r e2b2f08d054e -r a2656b27cace tests/stx_goodies_petitparser_tests.st --- a/tests/stx_goodies_petitparser_tests.st Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/stx_goodies_petitparser_tests.st Fri Oct 03 01:59:10 2014 +0100 @@ -8,6 +8,16 @@ ! +!stx_goodies_petitparser_tests class methodsFor:'accessing - monticello'! + +monticelloName + "Return name of the package for Monticello. This is used when package is exported" + + ^ 'PetitTests' + + "Created: / 03-10-2014 / 01:48:05 / Jan Vrany " +! ! + !stx_goodies_petitparser_tests class methodsFor:'description'! excludedFromPreRequisites @@ -128,5 +138,9 @@ version_CVS ^ '$Header: /cvs/stx/stx/goodies/petitparser/tests/stx_goodies_petitparser_tests.st,v 1.3 2014-03-04 20:32:06 cg Exp $' +! + +version_HG + ^ '$Changeset: $' ! ! diff -r e2b2f08d054e -r a2656b27cace tests/tests.rc --- a/tests/tests.rc Fri Oct 03 01:36:33 2014 +0100 +++ b/tests/tests.rc Fri Oct 03 01:59:10 2014 +0100 @@ -3,8 +3,8 @@ // automagically generated from the projectDefinition: stx_goodies_petitparser_tests. // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,2,1,2 - PRODUCTVERSION 6,2,3,0 + FILEVERSION 6,2,32767,32767 + PRODUCTVERSION 6,2,4,0 #if (__BORLANDC__) FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD @@ -20,12 +20,12 @@ BEGIN VALUE "CompanyName", "eXept Software AG\0" VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0" - VALUE "FileVersion", "6.2.1.2\0" + VALUE "FileVersion", "6.2.32767.32767\0" VALUE "InternalName", "stx:goodies/petitparser/tests\0" VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2014\nCopyright eXept Software AG 1998-2014\0" VALUE "ProductName", "Smalltalk/X\0" - VALUE "ProductVersion", "6.2.3.0\0" - VALUE "ProductDate", "Tue, 04 Mar 2014 20:31:53 GMT\0" + VALUE "ProductVersion", "6.2.4.0\0" + VALUE "ProductDate", "Fri, 03 Oct 2014 00:58:04 GMT\0" END END