Mercurial Mercurial > hg > stx-libcomp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sharedPools
authorca
Mon, 20 Sep 2004 10:47:02 +0200
changeset 1553 1657d0843c64
parent 1552 8ee631830fb7
child 1554 8e923008be65
sharedPools
SyntaxHighlighter.st file | annotate | diff | comparison | revisions
VariableNode.st file | annotate | diff | comparison | revisions 
--- a/SyntaxHighlighter.st	Mon Sep 20 10:46:03 2004 +0200
+++ b/SyntaxHighlighter.st	Mon Sep 20 10:47:02 2004 +0200
@@ -295,7 +295,8 @@
 markArgumentIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences argumentIdentifierEmphasis) color:(preferences argumentIdentifierColor)
+        withEmphasis:(preferences argumentIdentifierEmphasis) 
+        color:(preferences argumentIdentifierColor)
 
     "Modified: / 31.3.1998 / 18:01:27 / cg"
 !
@@ -303,13 +304,15 @@
 markBadIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences badIdentifierEmphasis) color:(preferences badIdentifierColor)
+        withEmphasis:(preferences badIdentifierEmphasis) 
+        color:(preferences badIdentifierColor)
 !
 
 markBooleanConstantFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences booleanConstantEmphasis) color:(preferences booleanConstantColor)
+        withEmphasis:(preferences booleanConstantEmphasis) 
+        color:(preferences booleanConstantColor)
 
     "Created: / 31.3.1998 / 18:09:01 / cg"
     "Modified: / 31.3.1998 / 19:36:44 / cg"
@@ -318,7 +321,8 @@
 markBracketAt:pos
     self 
         markFrom:pos to:pos 
-        withEmphasis:(preferences bracketEmphasis) color:(preferences bracketColor)
+        withEmphasis:(preferences bracketEmphasis) 
+        color:(preferences bracketColor)
 
     "Created: / 31.3.1998 / 18:09:01 / cg"
     "Modified: / 31.3.1998 / 19:36:44 / cg"
@@ -327,7 +331,8 @@
 markClassVariableIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences classVariableIdentifierEmphasis) color:(preferences classVariableIdentifierColor)
+        withEmphasis:(preferences classVariableIdentifierEmphasis) 
+        color:(preferences classVariableIdentifierColor)
 
     "Modified: / 31.3.1998 / 18:02:14 / cg"
 !
@@ -335,7 +340,8 @@
 markCommentFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences commentEmphasis) color:(preferences commentColor)
+        withEmphasis:(preferences commentEmphasis) 
+        color:(preferences commentColor)
 
     "
      UserPreferences current commentEmphasis
@@ -346,7 +352,8 @@
 markConstantFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences constantEmphasis) color:(preferences constantColor)
+        withEmphasis:(preferences constantEmphasis) 
+        color:(preferences constantColor)
 
     "Modified: / 31.3.1998 / 18:01:44 / cg"
     "Created: / 31.3.1998 / 18:09:22 / cg"
@@ -380,7 +387,8 @@
 markGlobalClassIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences globalClassIdentifierEmphasis) color:(preferences globalClassIdentifierColor)
+        withEmphasis:(preferences globalClassIdentifierEmphasis) 
+        color:(preferences globalClassIdentifierColor)
 
     "Modified: / 31.3.1998 / 18:02:14 / cg"
     "Created: / 4.3.1999 / 12:53:02 / cg"
@@ -389,7 +397,8 @@
 markGlobalIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences globalIdentifierEmphasis) color:(preferences globalIdentifierColor)
+        withEmphasis:(preferences globalIdentifierEmphasis) 
+        color:(preferences globalIdentifierColor)
 
     "Modified: / 31.3.1998 / 18:02:14 / cg"
 !
@@ -397,7 +406,8 @@
 markHereFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences hereEmphasis) color:(preferences hereColor)
+        withEmphasis:(preferences hereEmphasis) 
+        color:(preferences hereColor)
 
     "Modified: / 31.3.1998 / 18:02:25 / cg"
 !
@@ -405,7 +415,8 @@
 markIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences identifierEmphasis) color:(preferences identifierColor)
+        withEmphasis:(preferences identifierEmphasis) 
+        color:(preferences identifierColor)
 
     "Modified: / 31.3.1998 / 18:02:39 / cg"
     "Created: / 31.3.1998 / 18:04:56 / cg"
@@ -414,7 +425,8 @@
 markInstVarIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences instVarIdentifierEmphasis) color:(preferences instVarIdentifierColor)
+        withEmphasis:(preferences instVarIdentifierEmphasis)    
+        color:(preferences instVarIdentifierColor)
 
     "Created: / 16.4.1998 / 18:35:40 / cg"
     "Modified: / 16.4.1998 / 18:37:30 / cg"
@@ -423,7 +435,8 @@
 markLocalIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences localIdentifierEmphasis) color:(preferences localIdentifierColor)
+        withEmphasis:(preferences localIdentifierEmphasis) 
+        color:(preferences localIdentifierColor)
 
     "Modified: / 31.3.1998 / 18:02:39 / cg"
 !
@@ -431,15 +444,24 @@
 markMethodSelectorFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences methodSelectorEmphasis) color:(preferences methodSelectorColor)
+        withEmphasis:(preferences methodSelectorEmphasis) 
+        color:(preferences methodSelectorColor)
 
     "Modified: / 31.3.1998 / 18:02:52 / cg"
 !
 
+markPoolVariableIdentifierFrom:pos1 to:pos2
+    self 
+        markFrom:pos1 to:pos2 
+        withEmphasis:(preferences poolVariableIdentifierEmphasis) 
+        color:(preferences poolVariableIdentifierColor)
+!
+
 markReturnAt:pos
     self 
         markFrom:pos to:pos 
-        withEmphasis:(preferences returnEmphasis) color:(preferences returnColor)
+        withEmphasis:(preferences returnEmphasis) 
+        color:(preferences returnColor)
 
     "Modified: / 31.3.1998 / 19:36:44 / cg"
     "Created: / 5.1.1980 / 00:44:27 / cg"
@@ -512,7 +534,8 @@
     ].
     self
         markFrom:pos1 to:pos2 
-        withEmphasis:em color:fg
+        withEmphasis:em 
+        color:fg
 
     "Modified: / 1.4.1998 / 13:14:43 / cg"
 !
@@ -520,7 +543,8 @@
 markSelfFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences selfEmphasis) color:(preferences selfColor)
+        withEmphasis:(preferences selfEmphasis) 
+        color:(preferences selfColor)
 
     "Modified: / 31.3.1998 / 18:03:10 / cg"
 !
@@ -528,7 +552,8 @@
 markStringFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences stringEmphasis) color:(preferences stringColor)
+        withEmphasis:(preferences stringEmphasis) 
+        color:(preferences stringColor)
 
     "Modified: / 31.3.1998 / 18:03:18 / cg"
 !
@@ -536,7 +561,8 @@
 markSuperFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences superEmphasis) color:(preferences superColor)
+        withEmphasis:(preferences superEmphasis) 
+        color:(preferences superColor)
 
     "Modified: / 31.3.1998 / 18:03:26 / cg"
 !
@@ -544,7 +570,8 @@
 markSymbolFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences symbolEmphasis) color:(preferences symbolColor)
+        withEmphasis:(preferences symbolEmphasis) 
+        color:(preferences symbolColor)
 
     "Created: / 1.4.1998 / 12:56:47 / cg"
     "Modified: / 1.4.1998 / 12:58:00 / cg"
@@ -553,7 +580,8 @@
 markThisContextFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences thisContextEmphasis) color:(preferences thisContextColor)
+        withEmphasis:(preferences thisContextEmphasis) 
+        color:(preferences thisContextColor)
 
     "Modified: / 31.3.1998 / 18:03:36 / cg"
 !
@@ -561,7 +589,8 @@
 markUnknownIdentifierFrom:pos1 to:pos2
     self 
         markFrom:pos1 to:pos2 
-        withEmphasis:(preferences unknownIdentifierEmphasis) color:(preferences unknownIdentifierColor)
+        withEmphasis:(preferences unknownIdentifierEmphasis) 
+        color:(preferences unknownIdentifierColor)
 
     "Created: / 31.3.1998 / 19:09:26 / cg"
     "Modified: / 31.3.1998 / 19:10:30 / cg"
@@ -607,6 +636,10 @@
         ].
         ^ self
     ].
+    (type == #PoolVariable) ifTrue:[
+        self markPoolVariableIdentifierFrom:pos to:endPos.
+        ^ self
+    ].
     (type == #ClassVariable) ifTrue:[
         self markClassVariableIdentifierFrom:pos to:endPos.
         ^ self
@@ -625,5 +658,5 @@
 !SyntaxHighlighter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/SyntaxHighlighter.st,v 1.46 2004-09-15 11:36:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/SyntaxHighlighter.st,v 1.47 2004-09-20 08:47:02 ca Exp $'
 ! !
--- a/VariableNode.st	Mon Sep 20 10:46:03 2004 +0200
+++ b/VariableNode.st	Mon Sep 20 10:47:02 2004 +0200
@@ -426,7 +426,7 @@
         ^ self
     ].
 
-    (type == #ClassVariable) ifTrue:[
+    ((type == #ClassVariable) or:[ type == #PoolVariable ]) ifTrue:[
         litIndex := aCompiler addLiteral:(value globalKeyForClassVar:name).
         litIndex < 256 ifTrue:[
             aStream nextPut:#pushClassVarS; nextPut:litIndex
@@ -599,7 +599,7 @@
         ^ self
     ].
 
-    (type == #ClassVariable) ifTrue:[
+    ((type == #ClassVariable) or:[type == #PoolVariable]) ifTrue:[
         litIndex := aCompiler addLiteral:(value globalKeyForClassVar:name).
         litIndex < 256 ifTrue:[
             aStream nextPut:#storeClassVarS; nextPut:litIndex
@@ -921,5 +921,5 @@
 !VariableNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/VariableNode.st,v 1.61 2003-10-07 13:38:47 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/VariableNode.st,v 1.62 2004-09-20 08:46:52 ca Exp $'
 ! !
hg/stx-libcomp