--- a/ParseErrorNode.st Thu Jan 27 11:56:02 2005 +0100
+++ b/ParseErrorNode.st Wed Feb 02 12:02:40 2005 +0100
@@ -1,3 +1,15 @@
+"
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+
"{ Package: 'stx:libcomp' }"
Object subclass:#ParseErrorNode
@@ -7,6 +19,21 @@
category:'System-Compiler-Support'
!
+!ParseErrorNode class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+! !
!ParseErrorNode class methodsFor:'instance creation'!
@@ -33,5 +60,5 @@
!ParseErrorNode class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/ParseErrorNode.st,v 1.1 2004-07-07 09:17:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/ParseErrorNode.st,v 1.2 2005-02-02 11:01:55 cg Exp $'
! !
--- a/Parser.st Thu Jan 27 11:56:02 2005 +0100
+++ b/Parser.st Wed Feb 02 12:02:40 2005 +0100
@@ -5859,9 +5859,15 @@
] ifTrue:[
nameSpaceGlobal isLoaded ifTrue:[
(nameSpaceGlobal privateClassesAt:varName asSymbol) isNil ifTrue:[
- self warning:('no private class: ' , varName , ' in class: ' , nameSpace)
- position:pos1 to:tokenPosition-1.
+ (Smalltalk at:rawName asSymbol) notNil ifTrue:[
+ self warning:('Possible name clash (global: ' , rawName , ' vs. private: ' , (nameSpace , '::', varName) , ') - assume globl.')
+ position:pos1 to:tokenPosition-1.
+ globlName := rawName asSymbol.
+ ] ifFalse:[
+ self warning:('no private class: ' , varName , ' in class: ' , nameSpace)
+ position:pos1 to:tokenPosition-1.
"/ self parseError:('no private class: ' , name , ' in class: ' , nameSpace) position:pos to:tokenPosition-1.
+ ]
]
]
]
@@ -7821,7 +7827,7 @@
!Parser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.449 2005-01-27 10:56:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/Parser.st,v 1.450 2005-02-02 11:01:40 cg Exp $'
! !
Parser initialize!
--- a/ProgramNodeEnumerator.st Thu Jan 27 11:56:02 2005 +0100
+++ b/ProgramNodeEnumerator.st Wed Feb 02 12:02:40 2005 +0100
@@ -1,3 +1,15 @@
+"
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+
"{ Package: 'stx:libcomp' }"
Object subclass:#ProgramNodeEnumerator
@@ -9,6 +21,20 @@
!ProgramNodeEnumerator class methodsFor:'documentation'!
+copyright
+"
+ COPYRIGHT (c) 2004 by eXept Software AG
+ All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
documentation
"
This is a pure mimicri class.
@@ -137,5 +163,5 @@
!ProgramNodeEnumerator class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libcomp/ProgramNodeEnumerator.st,v 1.3 2001-02-01 11:33:39 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libcomp/ProgramNodeEnumerator.st,v 1.4 2005-02-02 11:02:40 cg Exp $'
! !