Moved VDBInternalPipeStream from jv:vdb and jv:libgdbs and renamed to GDBInternalPipeStream
--- a/Make.proto Thu Jun 12 08:45:26 2014 +0100
+++ b/Make.proto Sat Jun 14 00:54:31 2014 +0100
@@ -106,6 +106,7 @@
cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -127,7 +128,6 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
$(OUTDIR)VDBDebuggerConsoleView.$(O) VDBDebuggerConsoleView.$(H): VDBDebuggerConsoleView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextCollector.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg2/TerminalView.$(H) $(STCHDR)
-$(OUTDIR)VDBInternalPipeStream.$(O) VDBInternalPipeStream.$(H): VDBInternalPipeStream.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
$(OUTDIR)jv_vdb.$(O) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)/jv/vdb/VDBAbstractApplication.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
--- a/Make.spec Thu Jun 12 08:45:26 2014 +0100
+++ b/Make.spec Sat Jun 14 00:54:31 2014 +0100
@@ -52,7 +52,6 @@
COMMON_CLASSES= \
VDBAbstractApplication \
VDBDebuggerConsoleView \
- VDBInternalPipeStream \
jv_vdb \
VDBAbstractContainer \
VDBDebuggerApplication \
@@ -67,7 +66,6 @@
COMMON_OBJS= \
$(OUTDIR_SLASH)VDBAbstractApplication.$(O) \
$(OUTDIR_SLASH)VDBDebuggerConsoleView.$(O) \
- $(OUTDIR_SLASH)VDBInternalPipeStream.$(O) \
$(OUTDIR_SLASH)jv_vdb.$(O) \
$(OUTDIR_SLASH)VDBAbstractContainer.$(O) \
$(OUTDIR_SLASH)VDBDebuggerApplication.$(O) \
--- a/VDBDebuggerConsoleApplication.st Thu Jun 12 08:45:26 2014 +0100
+++ b/VDBDebuggerConsoleApplication.st Sat Jun 14 00:54:31 2014 +0100
@@ -144,13 +144,13 @@
initialize
super initialize.
- consoleInput := VDBInternalPipeStream new.
- consoleOutput := VDBInternalPipeStream new.
+ consoleInput := GDBInternalPipeStream new.
+ consoleOutput := GDBInternalPipeStream new.
consoleOutputLock := RecursionLock new.
outstandingCommandBlocker := Semaphore new.
"Created: / 10-06-2014 / 01:23:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 11:46:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 14-06-2014 / 00:41:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
release
--- a/VDBInternalPipeStream.st Thu Jun 12 08:45:26 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-"{ Package: 'jv:vdb' }"
-
-Stream subclass:#VDBInternalPipeStream
- instanceVariableNames:'buffer first last accessLock dataAvailable spaceAvailable closed'
- classVariableNames:'DefaultBufferSize'
- poolDictionaries:''
- category:'VDB-Support'
-!
-
-!VDBInternalPipeStream class methodsFor:'documentation'!
-
-documentation
-"
- not useful on its own, but can be used to talk to a vt100
- terminal view ...
- See example.
-"
-!
-
-examples
-"
- [exBegin]
- |p|
-
- p := InternalPipeStream new.
- [
- 10 timesRepeat:[
- p nextPutLine:'hello'
- ].
- ] fork.
-
- [
- 10 timesRepeat:[
- Transcript showCR:p nextLine
- ].
- ] fork.
- [exEnd]
-
- [exBegin]
- |userInput elizasOutput top terminal|
-
- userInput := InternalPipeStream new.
- elizasOutput := InternalPipeStream new.
-
- top := StandardSystemView new.
- terminal := VT100TerminalView openOnInput: userInput output:elizasOutput in:top.
-
- top extent:(terminal preferredExtent).
- top label:'The doctor is in'.
- top iconLabel:'doctor'.
- top open.
- top waitUntilVisible.
-
- terminal translateNLToCRNL:true.
- terminal inputTranslateCRToNL:true.
- terminal localEcho:true.
-
- elizasOutput nextPutLine:'Hi, I am Eliza'.
- elizasOutput nextPutLine:'What is your problem ?'.
- elizasOutput nextPutLine:''.
- elizasOutput nextPutAll:'>'.
-
- [top realized] whileTrue:[
- |line answer matchingRule|
-
- line := userInput nextLine.
- (#('quit' 'exit' 'end' 'bye') includes:line) ifTrue:[
- top destroy.
- ^ self
- ].
-
- answer := 'Tell me more.'.
- elizasOutput nextPutLine:answer.
- elizasOutput nextPutAll:'>'.
- ].
- [exEnd]
-"
-! !
-
-!VDBInternalPipeStream class methodsFor:'initialization'!
-
-initialize
- "Invoked at system start or when the class is dynamically loaded."
-
- "/ please change as required (and remove this comment)
-
- DefaultBufferSize := 1024.
-
- "Modified: / 07-06-2014 / 00:49:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream class methodsFor:'instance creation'!
-
-new
- ^ self newWithBufferSize: DefaultBufferSize
-
- "Modified: / 10-06-2014 / 00:26:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-newWithBufferSize: bufferSize
- ^ self basicNew initializeWithBufferSize: bufferSize
-
- "Created: / 07-06-2014 / 00:48:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'accessing'!
-
-atEnd
- ^ closed and:[ last == 0 ]
-
- "Modified: / 07-06-2014 / 01:06:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-close
- closed := true.
-
- "Modified: / 07-06-2014 / 01:02:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-size
- last == 0 ifTrue:[ ^ 0 ].
- last >= first ifTrue:[
- ^ last - first + 1
- ] ifFalse:[
- ^ buffer size - first + 1 + last
- ].
-
- "Modified: / 07-06-2014 / 01:08:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'initialization'!
-
-initializeWithBufferSize: bufferSize
- buffer := String new: bufferSize.
- first := 1.
- last := 0.
-
- accessLock := Semaphore forMutualExclusion." Plug new respondTo: #critical: with: [ :block | block value ]; yourself."
- dataAvailable := Semaphore new.
- spaceAvailable := Semaphore new.
-
- closed := false
-
- "Created: / 07-06-2014 / 00:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 23:12:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'non homogenous reading'!
-
-nextAvailableBytes:max into:out startingAt:offset
- | count |
-
- accessLock critical:[
- last == 0 ifTrue:[
- count := 0
- ] ifFalse:[
- last >= first ifTrue:[
- count := max min: (last - first + 1).
- out replaceFrom:offset to: offset + count - 1 with: buffer startingAt: first.
- first := first + count.
- first > last ifTrue:[
- first := 1.
- last := 0.
- ].
- spaceAvailable signalForAll.
- ] ifFalse:[
- "/ Wrap around
- count := max.
- first + count <= buffer size ifTrue:[
- out replaceFrom:offset to: offset + count - 1 with: buffer startingAt: first.
- first := (first + count) \\ buffer size.
- spaceAvailable signalForAll.
- ] ifFalse:[
- | rem |
-
- count := max min: (buffer size - first) + last.
- rem := buffer size - first.
- out replaceFrom: offset to: offset + (buffer size - first) with: buffer startingAt: first.
-
- out replaceFrom: offset + (buffer size - first + 1) to: offset + count with: buffer startingAt: 1.
- rem == last ifTrue:[
- first := 1.
- last := 0.
- ] ifFalse:[
- first := rem + 1.
- ].
- ].
- ].
- ].
- ].
- ^ count
-
- "Modified: / 11-06-2014 / 21:40:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'non homogenous writing'!
-
-nextPutBytes:count from:bytes startingAt:start
- "Write count bytes from an object starting at index start.
- Return the number of bytes written.
- The object must have non-pointer indexed instvars
- (i.e. be a ByteArray, String, Float- or DoubleArray).
- Use with care - non object oriented i/o.
- This is provided for compatibility with externalStream;
- to support binary storage"
-
- | written write remaining offset space |
-
- closed ifTrue:[
- self class writeErrorSignal signal:'Pipe stream closed'.
- ].
- written := 0.
- remaining := count.
- offset := start.
-
- space := true.
- [ space and:[remaining > 0] ] whileTrue:[
- accessLock critical:[
- space := ("self hasSpace"last == 0 or:[ ( (last \\ buffer size) + 1) ~~ first]).
- space ifTrue:[
- last == 0 ifTrue:[
- "/ Special case - empty buffer
- write := remaining min: bytes size.
- buffer replaceFrom:1 to: write with: bytes startingAt: offset.
- last := write.
- ] ifFalse:[
- | lastPlusOne |
-
- lastPlusOne := (last \\ buffer size) + 1.
-
- first < lastPlusOne ifTrue:[
- write := remaining min: (buffer size - last).
- ] ifFalse:[
- write := (first - lastPlusOne + 1) min: remaining.
- ].
- buffer replaceFrom: lastPlusOne to: lastPlusOne + write - 1 with: bytes startingAt: offset.
- last := (last \\ buffer size) + write.
- ].
- remaining := remaining - write.
- written := written + write.
- offset := offset + write.
- dataAvailable signalForAll.
- ].
- ].
- ].
- ^ written.
-
- "Created: / 09-06-2014 / 22:04:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 22:59:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'private'!
-
-contentsSpecies
- ^ buffer class
-
- "Created: / 09-06-2014 / 21:50:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'private-queries'!
-
-hasData
- ^ last ~~ 0
-
- "Created: / 11-06-2014 / 21:19:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-hasSpace
- ^ last == 0 or:[ ( (last \\ buffer size) + 1) ~~ first]
-
- "Created: / 11-06-2014 / 21:18:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'reading'!
-
-next
- "return the next element from the stream (might block until something is written)"
-
- | c |
-
- [
- accessLock critical:[
- ("self hasData"last ~~ 0) ifTrue:[
- c := buffer at: first.
- first == last ifTrue:[
- first := 1.
- last := 0.
- ] ifFalse:[
- first := (first \\ buffer size) + 1
- ].
- spaceAvailable signalForAll.
- ^ c
- ] ifFalse:[
- closed ifTrue:[ ^ nil ]
- ].
- ].
- dataAvailable wait.
- ] loop.
-
- "Modified: / 11-06-2014 / 21:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'synchronization'!
-
-readWait
- last == 0 ifTrue:[
- dataAvailable wait.
- ].
-
- "Modified: / 07-06-2014 / 01:09:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-writeWait
- | hasSpace |
-
- accessLock critical:[ hasSpace := self hasSpace ].
- hasSpace ifTrue:[
- spaceAvailable wait.
- ].
-
- "Created: / 11-06-2014 / 22:04:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream methodsFor:'writing'!
-
-nextPut:aCharacter
- | done |
-
- closed ifTrue:[
- self class writeErrorSignal signal:'Pipe stream closed'.
- ^ self.
- ].
-
- done := false.
- [ done ] whileFalse:[
- accessLock critical:[
- ("self hasSpace"last == 0 or:[ ( (last \\ buffer size) + 1) ~~ first]) ifTrue:[
- last := (last \\ buffer size) + 1.
- buffer at: last put: aCharacter.
- done := true.
- ].
- ].
- done ifFalse:[
- spaceAvailable wait.
- ].
- ].
- dataAvailable signalForAll.
-
- "Modified: / 11-06-2014 / 21:49:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-nextPutAll:aCollection
- "Put all elements of the argument, aCollection onto the receiver."
-
- ^ self nextPutAll: aCollection startingAt: 1 to: aCollection size
-
- "Created: / 09-06-2014 / 21:58:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-nextPutAll:aCollection startingAt:firstIndex to: lastIndex
- "Append the elements with index from firstIndex to lastIndex
- of the argument, aCollection, onto the receiver."
-
- closed ifTrue:[
- self class writeErrorSignal signal:'Pipe stream closed'.
- ].
-
- (aCollection class == self contentsSpecies) ifTrue:[
- | remaining offset written |
-
- remaining := lastIndex - firstIndex + 1.
- offset := firstIndex.
- [ remaining > 0 ] whileTrue:[
- written := self nextPutBytes: remaining from: aCollection startingAt: offset.
- remaining := remaining - written.
- offset := offset + written.
- remaining > 0 ifTrue:[
- self writeWait.
- ].
- ].
-
- ] ifFalse:[
- super nextPutAll:aCollection startingAt:firstIndex to: lastIndex
- ].
-
- "Created: / 09-06-2014 / 21:57:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 23:04:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStream class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
-
-
-VDBInternalPipeStream initialize!
--- a/abbrev.stc Thu Jun 12 08:45:26 2014 +0100
+++ b/abbrev.stc Sat Jun 14 00:54:31 2014 +0100
@@ -3,7 +3,6 @@
# it provides information about a classes filename, category and especially namespace.
VDBAbstractApplication VDBAbstractApplication jv:vdb 'VDB-UI-Abstract' 1
VDBDebuggerConsoleView VDBDebuggerConsoleView jv:vdb 'VDB-UI-Console' 2
-VDBInternalPipeStream VDBInternalPipeStream jv:vdb 'VDB-Support' 0
jv_vdb jv_vdb jv:vdb '* Projects & Packages *' 3
VDBAbstractContainer VDBAbstractContainer jv:vdb 'VDB-UI-Abstract' 1
VDBDebuggerApplication VDBDebuggerApplication jv:vdb 'VGB-UI' 1
--- a/bc.mak Thu Jun 12 08:45:26 2014 +0100
+++ b/bc.mak Sat Jun 14 00:54:31 2014 +0100
@@ -55,6 +55,7 @@
pushd ..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -73,7 +74,6 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)VDBAbstractApplication.$(O) VDBAbstractApplication.$(H): VDBAbstractApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
$(OUTDIR)VDBDebuggerConsoleView.$(O) VDBDebuggerConsoleView.$(H): VDBDebuggerConsoleView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TerminalView.$(H) $(STCHDR)
-$(OUTDIR)VDBInternalPipeStream.$(O) VDBInternalPipeStream.$(H): VDBInternalPipeStream.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
$(OUTDIR)jv_vdb.$(O) jv_vdb.$(H): jv_vdb.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
$(OUTDIR)VDBAbstractContainer.$(O) VDBAbstractContainer.$(H): VDBAbstractContainer.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
$(OUTDIR)VDBDebuggerApplication.$(O) VDBDebuggerApplication.$(H): VDBDebuggerApplication.st $(INCLUDE_TOP)\jv\vdb\VDBAbstractApplication.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
--- a/jv_vdb.st Thu Jun 12 08:45:26 2014 +0100
+++ b/jv_vdb.st Sat Jun 14 00:54:31 2014 +0100
@@ -23,7 +23,7 @@
"list packages which are mandatory as a prerequisite.
This are packages containing superclasses of my classes and classes which
are extended by myself.
- They are mandatory, beacuse we need these packages as a prerequisite for loading and compiling.
+ They are mandatory, because we need these packages as a prerequisite for loading and compiling.
This method is generated automatically,
by searching along the inheritance chain of all of my classes."
@@ -32,6 +32,7 @@
#'stx:libview' "DisplaySurface - superclass of VDBDebuggerConsoleView "
#'stx:libview2' "ApplicationModel - superclass of VDBAbstractApplication "
#'stx:libwidg' "EditTextView - superclass of VDBDebuggerConsoleView "
+ #'stx:libwidg2' "TerminalView - superclass of VDBDebuggerConsoleView "
)
!
@@ -43,9 +44,8 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
- #'jv:libgdbs' "GDBCLICommand - referenced by VDBDebuggerConsoleView>>keyPressReturn "
- #'stx:libbasic2' "List - referenced by VDBEventLogApplication>>eventList "
- #'stx:libwidg2' "VT100TerminalView - referenced by VDBInferiorConsoleApplication>>consoleView "
+ #'jv:libgdbs' "GDBCLICommand - referenced by VDBDebuggerConsoleApplication>>commonPostOpen "
+ #'stx:libbasic2' "List - referenced by VDBAbstractContainer>>initialize "
)
!
@@ -71,7 +71,6 @@
"<className> or (<className> attributes...) in load order"
VDBAbstractApplication
VDBDebuggerConsoleView
- VDBInternalPipeStream
#'jv_vdb'
VDBAbstractContainer
VDBDebuggerApplication
--- a/libInit.cc Thu Jun 12 08:45:26 2014 +0100
+++ b/libInit.cc Sat Jun 14 00:54:31 2014 +0100
@@ -29,7 +29,6 @@
__BEGIN_PACKAGE2__("libjv_vdb", _libjv_vdb_Init, "jv:vdb");
_VDBAbstractApplication_Init(pass,__pRT__,snd);
_VDBDebuggerConsoleView_Init(pass,__pRT__,snd);
-_VDBInternalPipeStream_Init(pass,__pRT__,snd);
_jv_137vdb_Init(pass,__pRT__,snd);
_VDBAbstractContainer_Init(pass,__pRT__,snd);
_VDBDebuggerApplication_Init(pass,__pRT__,snd);
--- a/tests/Make.proto Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/Make.proto Sat Jun 14 00:54:31 2014 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/jv/vdb -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic
# if you need any additional defines for embedded C code,
@@ -102,10 +102,6 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
cd $(TOP)/libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -125,7 +121,6 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBInternalPipeStreamTests.$(O) VDBInternalPipeStreamTests.$(H): VDBInternalPipeStreamTests.st $(INCLUDE_TOP)/stx/goodies/sunit/TestAsserter.$(H) $(INCLUDE_TOP)/stx/goodies/sunit/TestCase.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(H): jv_vdb_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/tests/Make.spec Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/Make.spec Sat Jun 14 00:54:31 2014 +0100
@@ -50,14 +50,12 @@
STCWARNINGS=-warnNonStandard
COMMON_CLASSES= \
- VDBInternalPipeStreamTests \
jv_vdb_tests \
COMMON_OBJS= \
- $(OUTDIR_SLASH)VDBInternalPipeStreamTests.$(O) \
$(OUTDIR_SLASH)jv_vdb_tests.$(O) \
--- a/tests/VDBInternalPipeStreamTests.st Thu Jun 12 08:45:26 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-"{ Package: 'jv:vdb/tests' }"
-
-TestCase subclass:#VDBInternalPipeStreamTests
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'VDB-Support-Tests'
-!
-
-
-!VDBInternalPipeStreamTests methodsFor:'tests'!
-
-test_01
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPut: $x.
- pipe nextPut: $y.
-
- self assert: pipe next == $x.
- self assert: pipe next == $y.
-
- "Created: / 07-06-2014 / 00:52:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_01a
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPutAll: 'xy'.
-
- self assert: (pipe next: 2) = 'xy'.
-
- "Created: / 09-06-2014 / 21:45:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_01c
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPut: $x.
- pipe nextPut: $y.
-
- self assert: (pipe next: 2) = 'xy'.
-
- "Created: / 09-06-2014 / 21:46:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_02
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPut: $x.
- pipe nextPut: $y.
- pipe nextPut: $z.
-
- self assert: pipe next == $x.
- self assert: pipe next == $y.
-
- pipe nextPut: $a.
- pipe nextPut: $b.
-
- self assert: pipe next == $z.
- self assert: pipe next == $a.
- self assert: pipe next == $b.
-
- "Created: / 07-06-2014 / 00:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_02b
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPutAll: 'xyz'.
-
- self assert: pipe next == $x.
- self assert: pipe next == $y.
-
- pipe nextPutAll: 'ab'.
-
- self assert: pipe next == $z.
- self assert: pipe next == $a.
- self assert: pipe next == $b.
-
- "Created: / 09-06-2014 / 22:42:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_02c
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPutAll: 'xy'.
-
- self assert: pipe next == $x.
-
- pipe nextPutAll: 'ab'.
-
- self assert: pipe next == $y.
- self assert: pipe next == $a.
- self assert: pipe next == $b.
-
- "Created: / 09-06-2014 / 22:46:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_03
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPut: $x.
- pipe nextPut: $y.
- pipe nextPut: $z.
-
- self assert: pipe next == $x.
- self assert: pipe next == $y.
-
- pipe nextPut: $a.
- pipe nextPut: $b.
-
- self assert: pipe next == $z.
- self assert: pipe next == $a.
-
- pipe nextPut: $1.
- pipe nextPut: $2.
-
- self assert: pipe next == $b.
- self assert: pipe next == $1.
- self assert: pipe next == $2.
-
- "Created: / 07-06-2014 / 00:56:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_04
- | pipe |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- pipe nextPut: $x.
- pipe nextPut: $y.
-
- pipe close.
- self should: [ pipe nextPut: $X ] raise: Stream writeErrorSignal.
-
- self assert: pipe atEnd not.
- self assert: pipe next == $x.
- self assert: pipe next == $y.
- self assert: pipe next isNil.
- self assert: pipe atEnd.
-
- "Created: / 07-06-2014 / 01:06:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_05a
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- buffer := String new: 10.
- pipe nextPutAll: 'xy'.
- pipe nextPut: $z.
-
- self assert: (pipe nextAvailableBytes: 3 into: buffer startingAt: 1) == 3.
- self assert: (buffer at: 1) == $x.
- self assert: (buffer at: 2) == $y.
- self assert: (buffer at: 3) == $z.
-
- "Created: / 10-06-2014 / 00:01:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_05b
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- buffer := String new: 10.
- pipe nextPutAll: 'xy'.
- pipe nextPut: $z.
-
- self assert: (pipe nextAvailableBytes: 30 into: buffer startingAt: 1) == 3.
- self assert: (buffer at: 1) == $x.
- self assert: (buffer at: 2) == $y.
- self assert: (buffer at: 3) == $z.
-
- "Created: / 10-06-2014 / 00:01:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_05c
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- buffer := String new: 10.
- pipe nextPutAll: 'xy'.
- pipe nextPut: $z.
-
- self assert: (pipe nextAvailableBytes: 2 into: buffer startingAt: 1) == 2.
- self assert: (buffer at: 1) == $x.
- self assert: (buffer at: 2) == $y.
- self assert: (pipe nextAvailableBytes: 2 into: buffer startingAt: 3) == 1.
- self assert: (buffer at: 3) == $z.
-
- "Created: / 10-06-2014 / 00:01:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_05d
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- buffer := String new: 10.
- pipe nextPutAll: 'xy'.
- pipe next.
- pipe nextPutAll: 'ab'.
-
- self assert: (pipe nextAvailableBytes: 3 into: buffer startingAt: 1) == 2.
- self assert: (buffer at: 1) == $y.
- self assert: (buffer at: 2) == $a.
- self assert: (buffer at: 3) == $b.
-
- "Created: / 10-06-2014 / 00:21:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_05e
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 3.
- buffer := String new: 10.
- pipe nextPutAll: 'xy'.
- pipe next.
- pipe nextPutAll: 'ab'.
-
- self assert: (pipe nextAvailableBytes: 3 into: buffer startingAt: 1) == 2.
- self assert: (buffer at: 1) == $y.
- self assert: (buffer at: 2) == $a.
- self assert: (buffer at: 3) == $b.
-
- "Created: / 10-06-2014 / 00:28:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_06a
- | pipe buffer |
-
- pipe := VDBInternalPipeStream newWithBufferSize: 15.
- buffer := String new: 10.
-
- pipe nextPutAll: 'xy'.
- pipe nextPut: Character nl.
- self assert: pipe nextLine = 'xy'.
-
- pipe nextPutAll: 'ayz z'.
- pipe nextPut: Character nl.
- self assert: pipe nextLine = 'ayz z'.
-
- "Created: / 11-06-2014 / 13:06:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-test_06b
- | pipe |
-
- pipe := VDBInternalPipeStream new.
- pipe nextPutAll: 'show inferior-tty'.
- pipe nextPut: Character cr.
-
- self assert: pipe nextLine = 'show inferior-tty'.
-
- pipe nextPutAll: 'ayz z'.
- pipe nextPut: Character nl.
- self assert: pipe nextLine = 'ayz z'.
-
- "Created: / 11-06-2014 / 13:19:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 11-06-2014 / 21:39:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!VDBInternalPipeStreamTests class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
-
--- a/tests/abbrev.stc Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/abbrev.stc Sat Jun 14 00:54:31 2014 +0100
@@ -1,5 +1,4 @@
# 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.
-VDBInternalPipeStreamTests VDBInternalPipeStreamTests jv:vdb/tests 'VDB-Support-Tests' 1
jv_vdb_tests jv_vdb_tests jv:vdb/tests '* Projects & Packages *' 3
--- a/tests/bc.mak Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/bc.mak Sat Jun 14 00:54:31 2014 +0100
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\jv\vdb -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -51,10 +51,6 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\..\..\stx\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -71,7 +67,6 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)VDBInternalPipeStreamTests.$(O) VDBInternalPipeStreamTests.$(H): VDBInternalPipeStreamTests.st $(INCLUDE_TOP)\stx\goodies\sunit\TestAsserter.$(H) $(INCLUDE_TOP)\stx\goodies\sunit\TestCase.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)jv_vdb_tests.$(O) jv_vdb_tests.$(H): jv_vdb_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/tests/jv_vdb_tests.st Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/jv_vdb_tests.st Sat Jun 14 00:54:31 2014 +0100
@@ -23,12 +23,11 @@
"list packages which are mandatory as a prerequisite.
This are packages containing superclasses of my classes and classes which
are extended by myself.
- They are mandatory, beacuse we need these packages as a prerequisite for loading and compiling.
+ They are mandatory, because we need these packages as a prerequisite for loading and compiling.
This method is generated automatically,
by searching along the inheritance chain of all of my classes."
^ #(
- #'stx:goodies/sunit' "TestAsserter - superclass of VDBInternalPipeStreamTests "
#'stx:libbasic' "LibraryDefinition - superclass of jv_vdb_tests "
)
!
@@ -41,7 +40,6 @@
by searching all classes (and their packages) which are referenced by my classes."
^ #(
- #'jv:vdb' "VDBInternalPipeStream - referenced by VDBInternalPipeStreamTests>>test_01 "
)
!
@@ -65,7 +63,6 @@
^ #(
"<className> or (<className> attributes...) in load order"
- VDBInternalPipeStreamTests
#'jv_vdb_tests'
)
!
--- a/tests/libInit.cc Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/libInit.cc Sat Jun 14 00:54:31 2014 +0100
@@ -27,7 +27,6 @@
void _libjv_vdb_tests_Init(pass, __pRT__, snd)
OBJ snd; struct __vmData__ *__pRT__; {
__BEGIN_PACKAGE2__("libjv_vdb_tests", _libjv_vdb_tests_Init, "jv:vdb/tests");
-_VDBInternalPipeStreamTests_Init(pass,__pRT__,snd);
_jv_137vdb_137tests_Init(pass,__pRT__,snd);
--- a/tests/tests.rc Thu Jun 12 08:45:26 2014 +0100
+++ b/tests/tests.rc Sat Jun 14 00:54:31 2014 +0100
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
VALUE "ProductName", "LibraryName\0"
VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Thu, 12 Jun 2014 07:44:27 GMT\0"
+ VALUE "ProductDate", "Fri, 13 Jun 2014 23:52:59 GMT\0"
END
END
--- a/vdb.rc Thu Jun 12 08:45:26 2014 +0100
+++ b/vdb.rc Sat Jun 14 00:54:31 2014 +0100
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "My CopyRight or CopyLeft\0"
VALUE "ProductName", "LibraryName\0"
VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Thu, 12 Jun 2014 07:44:25 GMT\0"
+ VALUE "ProductDate", "Fri, 13 Jun 2014 23:52:57 GMT\0"
END
END