--- a/ApplicationDefinition.st Tue Sep 25 17:09:50 2012 +0100
+++ b/ApplicationDefinition.st Thu Sep 27 20:33:09 2012 +0100
@@ -2847,13 +2847,13 @@
!ApplicationDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.202 2012/09/09 20:26:40 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.203 2012/09/26 19:17:29 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.202 2012/09/09 20:26:40 cg Exp $'
+ ^ '§Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.203 2012/09/26 19:17:29 cg Exp §'
!
version_SVN
- ^ '§ Id: ApplicationDefinition.st 10645 2011-06-09 15:28:45Z vranyj1 §'
+ ^ '$ Id: ApplicationDefinition.st 10645 2011-06-09 15:28:45Z vranyj1 $'
! !
--- a/ExternalLibraryFunction.st Tue Sep 25 17:09:50 2012 +0100
+++ b/ExternalLibraryFunction.st Thu Sep 27 20:33:09 2012 +0100
@@ -570,19 +570,27 @@
printOn:aStream
aStream nextPutAll:'<'.
self isCallTypeAPI ifTrue:[
- 'API:' printOn:aStream.
+ 'API:' printOn:aStream.
] ifFalse:[
- 'C:' printOn:aStream.
+ self isCallTypeOLE ifTrue:[
+ 'OLE:' printOn:aStream.
+ ] ifFalse:[
+ self isCallTypeC ifTrue:[
+ 'C:' printOn:aStream.
+ ] ifFalse:[
+ self error.
+ ].
+ ].
].
aStream nextPutAll:' '.
name printOn:aStream.
moduleName notNil ifTrue:[
- aStream nextPutAll:' module:'.
- moduleName printOn:aStream.
+ aStream nextPutAll:' module:'.
+ moduleName printOn:aStream.
].
aStream nextPutAll:'>'.
- "Modified: / 01-08-2006 / 15:21:42 / cg"
+ "Modified: / 25-09-2012 / 12:06:14 / cg"
! !
!ExternalLibraryFunction methodsFor:'private'!
@@ -1628,11 +1636,11 @@
!ExternalLibraryFunction class methodsFor:'documentation'!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.86 2012/04/15 16:58:21 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/ExternalLibraryFunction.st,v 1.87 2012/09/25 10:11:36 cg Exp §'
!
version_SVN
- ^ '$Id: ExternalLibraryFunction.st 10807 2012-05-05 21:58:24Z vranyj1 $'
+ ^ '$Id: ExternalLibraryFunction.st 10852 2012-09-27 19:33:09Z vranyj1 $'
! !
ExternalLibraryFunction initialize!
--- a/Method.st Tue Sep 25 17:09:50 2012 +0100
+++ b/Method.st Thu Sep 27 20:33:09 2012 +0100
@@ -2575,7 +2575,7 @@
!
indexOfOLECall
- "return true, if the method contains ole call; false if not.
+ "return the vtable inedx, if the method contains an ole call; nil if not.
Uses Parser to parse methods source and get the information."
|funcOrNil|
@@ -2598,6 +2598,8 @@
(IUnknownPointer compiledMethodAt:#invokeAddRef) isOLECall
(IUnknownPointer compiledMethodAt:#invokeAddRef) indexOfOLECall
"
+
+ "Modified (comment): / 25-09-2012 / 12:01:32 / cg"
!
isDocumentationMethod
@@ -3789,11 +3791,11 @@
!Method class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.394 2012/08/02 12:23:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.395 2012/09/25 10:12:26 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/Method.st,v 1.394 2012/08/02 12:23:16 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/Method.st,v 1.395 2012/09/25 10:12:26 cg Exp §'
!
version_SVN
--- a/Object.st Tue Sep 25 17:09:50 2012 +0100
+++ b/Object.st Thu Sep 27 20:33:09 2012 +0100
@@ -561,10 +561,6 @@
!Object methodsFor:'Compatibility-Squeak'!
-asString
- ^ self printString
-!
-
becomeForward:anotherObject
self becomeSameAs:anotherObject
!
@@ -2172,6 +2168,14 @@
^ Array with:self
!
+asString
+ ^ self printString
+!
+
+asUnicode16String
+ ^ self asString asUnicode16String
+!
+
asValue
"return a valueHolder for for the receiver"
@@ -9503,11 +9507,11 @@
!Object class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.695 2012/08/03 18:59:52 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.696 2012/09/20 15:26:03 stefan Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/Object.st,v 1.695 2012/08/03 18:59:52 stefan Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/Object.st,v 1.696 2012/09/20 15:26:03 stefan Exp §'
!
version_SVN
--- a/Process.st Tue Sep 25 17:09:50 2012 +0100
+++ b/Process.st Thu Sep 27 20:33:09 2012 +0100
@@ -1268,6 +1268,15 @@
"Modified: 23.12.1995 / 18:35:29 / cg"
!
+isDebugged
+ "return true, iff the receiver process is currently being debugged
+ (i.e. is stopped and a debugger sits on top of it)"
+
+ ^ (state == #debug)
+
+ "Created: / 26-09-2012 / 14:56:36 / cg"
+!
+
isGUIProcess
"return true, if this is a GUI process.
I.e. a windowGroup process.
@@ -2072,11 +2081,11 @@
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/Process.st,v 1.174 2011/08/07 13:31:37 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/Process.st,v 1.175 2012/09/26 12:57:59 cg Exp §'
!
version_SVN
- ^ '$Id: Process.st 10714 2011-10-07 12:25:01Z vranyj1 $'
+ ^ '$Id: Process.st 10852 2012-09-27 19:33:09Z vranyj1 $'
! !
Process initialize!
--- a/ProjectDefinition.st Tue Sep 25 17:09:50 2012 +0100
+++ b/ProjectDefinition.st Thu Sep 27 20:33:09 2012 +0100
@@ -619,6 +619,8 @@
"Modified: / 14-09-2006 / 14:49:17 / cg"
!
+
+
packageName
"the last component"
@@ -1068,7 +1070,6 @@
self classNamesAndAttributes:newSpec usingCompiler:compilerOrNil
! !
-
!ProjectDefinition class methodsFor:'accessing - tests'!
excludedFromTestSuite
@@ -1303,14 +1304,14 @@
(ignored includes:className) ifFalse:[
cls := Smalltalk classNamed:className.
- ignoreOldDefinition ifTrue:[
- (cls notNil and:[cls isLoaded not]) ifTrue:[
- (newEntry includes:#autoload) ifFalse:[
- newEntry := newEntry copyWith:#autoload.
+ cls notNil ifTrue:[
+ ignoreOldDefinition ifTrue:[
+ cls isLoaded ifFalse:[
+ (newEntry includes:#autoload) ifFalse:[
+ newEntry := newEntry copyWith:#autoload.
+ ].
].
].
- ].
- cls notNil ifTrue:[
"JV @ 2010-06-19
Force merge default class attributes with existing ones"
newEntry := self mergeDefaultClassAttributesFor: cls with: newEntry.
@@ -1327,7 +1328,7 @@
(ignored includes:className) ifFalse:[
oldSpecEntry := oldSpec detect:[:entry | entry first = className] ifNone:nil.
- (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
+ (ignoreOldEntries or:[oldSpecEntry isNil]) ifTrue:[
(eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
(self additionalClassNamesAndAttributes includes:className) ifFalse:[
(oldSpecEntry size > 1) ifTrue:[
@@ -1773,7 +1774,6 @@
"Modified: / 29-03-2012 / 18:43:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ProjectDefinition class methodsFor:'defaults'!
applicationTypes
@@ -2348,7 +2348,6 @@
"Created: / 18-08-2006 / 12:51:38 / cg"
! !
-
!ProjectDefinition class methodsFor:'description - project information'!
applicationAdditionalIconFileNames
@@ -4354,7 +4353,7 @@
@REM type lccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USELCC=1 %%*
+make.exe -N -f bc.mak -DUSELCC=1 %%*
%(SUBPROJECT_LCCMAKE_CALLS)
'
@@ -4465,7 +4464,7 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USEMINGW=1 %%*
+make.exe -N -f bc.mak -DUSEMINGW=1 %%*
%(SUBPROJECT_MINGWMAKE_CALLS)
'
@@ -4555,7 +4554,7 @@
@REM type tccmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak USETCC=1 %%*
+make.exe -N -f bc.mak -DUSETCC=1 %%*
%(SUBPROJECT_TCCMAKE_CALLS)
'
@@ -6819,15 +6818,15 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Id: ProjectDefinition.st 10848 2012-09-13 14:59:19Z vranyj1 $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.395 2012/09/26 19:17:12 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.393 2012/09/11 07:11:18 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.395 2012/09/26 19:17:12 cg Exp §'
!
version_SVN
- ^ '$Id:: ProjectDefinition.st 10848 2012-09-13 14:59:19Z vranyj1 $'
+ ^ '$ Id: ProjectDefinition.st 10645 2011-06-09 15:28:45Z vranyj1 $'
! !
ProjectDefinition initialize!
--- a/Stream.st Tue Sep 25 17:09:50 2012 +0100
+++ b/Stream.st Thu Sep 27 20:33:09 2012 +0100
@@ -2962,6 +2962,16 @@
"Modified: 15.5.1996 / 18:06:06 / cg"
!
+printCR:anObject
+ "append a printed representation of anObject to the receiver,
+ followed by a newline character."
+
+ self print:anObject.
+ self cr.
+
+ "Created: / 26-09-2012 / 18:21:06 / cg"
+!
+
show:something
"append a printed representation of the argument to the stream.
This makes streams somewhat compatible to TextCollectors and
@@ -3266,15 +3276,15 @@
!Stream class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.193 2012/09/06 14:19:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Stream.st,v 1.194 2012/09/26 16:21:22 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/Stream.st,v 1.193 2012/09/06 14:19:01 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/Stream.st,v 1.194 2012/09/26 16:21:22 cg Exp §'
!
version_SVN
- ^ '$Id: Stream.st 10847 2012-09-13 08:54:28Z vranyj1 $'
+ ^ '$Id: Stream.st 10852 2012-09-27 19:33:09Z vranyj1 $'
! !
Stream initialize!
--- a/String.st Tue Sep 25 17:09:50 2012 +0100
+++ b/String.st Thu Sep 27 20:33:09 2012 +0100
@@ -11,7 +11,7 @@
"
"{ Package: 'stx:libbasic' }"
-CharacterArray variableByteSubclass:#String
+CharacterArray subclass:#String
instanceVariableNames:''
classVariableNames:'CRLF CR LF TAB'
poolDictionaries:''
@@ -44,55 +44,6 @@
%}
! !
-!String primitiveFunctions!
-%{
-
-static int
-nextOnKeyboard(char1, char2)
-{
- /* compare two characters if they are next to each other on a (US-) keyboard */
-
- static char *us_keys[] = { "1234567890-",
- "*qwertyuiop",
- "**asdfghjkl:",
- "***zxcvbnm",
- 0 };
- static char *de_keys[] = { "1234567890-",
- "*qwertzuiop",
- "**asdfghjkl:",
- "***yxcvbnm",
- 0 };
- char **keys = us_keys;
- char **line1, **line2;
- char *col1, *col2;
- int diff;
-
- for (line1 = keys; *line1 != 0; line1++) {
- for (col1 = *line1; *col1 != 0 && *col1 != char1; col1++)
- continue;
- }
- if (*col1 == 0)
- return(0);
-
- for (line2 = keys; *line2 != 0; line2++) {
- for (col2 = *line2; *col2 != 0 && *col2 != char2; col2++)
- continue;
- }
- if (*col2 == 0)
- return(0);
-
- diff = col1 - col2;
- if (diff > 1 || diff < -1)
- return(0);
-
- diff = line1 - line2;
- if (diff > 1 || diff < -1)
- return(0);
- return(1);
-}
-%}
-! !
-
!String class methodsFor:'documentation'!
copyright
@@ -493,8 +444,6 @@
^ TAB
! !
-
-
!String class methodsFor:'queries'!
defaultPlatformClass
@@ -514,16 +463,6 @@
"Modified: 23.4.1996 / 16:00:38 / cg"
! !
-
-
-
-
-
-
-
-
-
-
!String methodsFor:'Compatibility-VW5.4'!
asGUID
@@ -717,7 +656,6 @@
"
! !
-
!String methodsFor:'character searching'!
identityIndexOf:aCharacter
@@ -2651,7 +2589,6 @@
^ super simpleDeepCopy
! !
-
!String methodsFor:'filling & replacing'!
atAllPut:aCharacter
@@ -3072,7 +3009,7 @@
%{ /* NOCONTEXT */
- if (__isStringLike(self) == String) {
+ if (__isStringLike(self)) {
if (@global(Stderr) == nil) {
console_fprintf(stderr, "%s\n" , __stringVal(self));
console_fflush(stderr);
@@ -3358,7 +3295,6 @@
^ String
! !
-
!String methodsFor:'sorting & reordering'!
reverse
@@ -3389,7 +3325,6 @@
^ super reverse
! !
-
!String methodsFor:'substring searching'!
indexOfSubCollection:aSubString startingAt:startIndex ifAbsent:exceptionValue caseSensitive:caseSensitive
@@ -3870,13 +3805,13 @@
!String class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.290 2012/08/23 15:47:22 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/String.st,v 1.291 2012/09/14 13:31:18 stefan Exp $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/String.st,v 1.290 2012/08/23 15:47:22 cg Exp '
+ ^ '§Header: /cvs/stx/stx/libbasic/String.st,v 1.291 2012/09/14 13:31:18 stefan Exp §'
!
version_SVN
- ^ '$Id:: String.st 10844 2012-09-07 16:24:32Z vranyj1 $'
+ ^ '$Id:: String.st 10852 2012-09-27 19:33:09Z vranyj1 $'
! !
--- a/UserPreferences.st Tue Sep 25 17:09:50 2012 +0100
+++ b/UserPreferences.st Thu Sep 27 20:33:09 2012 +0100
@@ -357,7 +357,7 @@
nextPutLine:'ParserFlags allowDolphinExtensions: ' , (ParserFlags allowDolphinExtensions storeString) , '.';
nextPutLine:'ParserFlags allowQualifiedNames: ' , (ParserFlags allowQualifiedNames storeString) , '.';
nextPutLine:'ParserFlags arraysAreImmutable: ' , (ParserFlags arraysAreImmutable storeString) , '.';
- nextPutLine:'Compiler lineNumberInfo: ' , (Compiler lineNumberInfo storeString) , '.';
+ nextPutLine:'ParserFlags lineNumberInfo: ' , (ParserFlags lineNumberInfo storeString) , '.';
nextPutLine:'Compiler foldConstants: ' , (Compiler foldConstants storeString) , '.';
nextPutLine:'ParserFlags stcCompilation: ' , (ParserFlags stcCompilation storeString) , '.';
@@ -545,7 +545,7 @@
"
"Modified: / 09-08-2006 / 18:52:14 / fm"
- "Modified: / 18-04-2011 / 17:13:34 / cg"
+ "Modified: / 26-09-2012 / 13:33:47 / cg"
! !
!UserPreferences methodsFor:'accessing'!
@@ -3843,6 +3843,7 @@
"Created: / 19-08-2011 / 12:51:58 / cg"
! !
+
!UserPreferences methodsFor:'default settings-syntax colors'!
listOfPredefinedSyntaxColoringSchemes
@@ -4113,11 +4114,11 @@
!UserPreferences class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.314 2012/09/05 09:28:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.315 2012/09/26 12:18:47 cg Exp $'
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.314 2012/09/05 09:28:30 cg Exp §'
+ ^ '§Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.315 2012/09/26 12:18:47 cg Exp §'
!
version_SVN