hg/stx-libtool: comparison SyntaxHighlighter2.st

equal deleted inserted replaced

-:235b77901045
+:4714b9640528
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 "
 ! !
 !SyntaxHighlighter2 class methodsFor:'highlighting'!
 formatClassDefinition:aString in:aClass elementsInto: elements
 "format (recolor) a class definition expression in a given class.
 "Modified: / 22-08-2006 / 13:32:04 / cg"
 "Created: / 05-07-2011 / 10:39:21 / cg"
 ! !
 !SyntaxHighlighter2 methodsFor:'accessing'!
 elements
 ^ elements
 !
 super tree: aParseNode.
 elements tree: aParseNode
 "Created: / 16-02-2012 / 09:56:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !SyntaxHighlighter2 methodsFor:'initialization'!
 initialize
 "Created: / 14-02-2010 / 13:08:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 21-08-2011 / 09:37:35 / cg"
 "Modified: / 16-02-2012 / 09:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !SyntaxHighlighter2 methodsFor:'parsing-expressions'!
 _binaryExpressionFor:receiverArg
 "parse a binary-expression; return a node-tree, nil or #Error"
 "Modified: / 19-01-2000 / 16:22:16 / cg"
 "Created: / 16-02-2012 / 21:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
+binaryExpressionFor:receiverArg
+"parse a binary-expression; return a node-tree, nil or #Error"
+|receiver expr arg sel pos1 pos2 lno|
+receiver := receiverArg.
+(receiver == #Error) ifTrue:[^ #Error].
+"special kludge: since Scanner cannot know if -digit is a binary
+expression or a negative constant, handle cases here"
+[(tokenType == #BinaryOperator)
+or:[(tokenType == $|)
+or:[(tokenType == $^ and:[parserFlags allowCaretAsBinop])
+or:[((tokenType == #Integer) or:[tokenType == #Float])
+and:[tokenValue < 0]]]]
+] whileTrue:[
+"/ kludge alarm: in a function-call argList, #, is not a binarySelector
+inFunctionCallArgument == true ifTrue:[
+((tokenType == #BinaryOperator) and:[tokenName = ',']) ifTrue:[
+^ receiver
+].
+].
+pos1 := tokenPosition.
+lno := tokenLineNr.
+"/ kludge alarm: bar, caret and minus are not scanned as binop
+(tokenType == $|) ifTrue:[
+sel := '|'.
+sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
+self nextToken.
+] ifFalse:[
+(tokenType == $^) ifTrue:[
+sel := '^'.
+sel := self selectorCheck:sel for:receiver position:tokenPosition to:tokenPosition.
+self nextToken.
+] ifFalse:[
+(tokenType == #BinaryOperator) ifTrue:[
+sel := tokenName.
+sel := self selectorCheck:sel for:receiver position:tokenPosition to:(tokenPosition + tokenName size - 1).
+self nextToken
+] ifFalse:[
+sel := '-'.
+token := tokenValue := tokenValue negated.
+tokenPosition := tokenPosition + 1. "/ to skip the sign
+]
+].
+].
+pos2 := pos1 + sel size - 1.
+self markSelector:sel from:pos1 to:pos2 receiverNode:receiver.
+lastSelectorElement := nil.
+arg := self unaryExpression.
+(arg == #Error) ifTrue:[^ #Error].
+expr := BinaryNode receiver:receiver selector:sel arg:arg fold:foldConstants.
+expr isErrorNode ifTrue:[
+self parseError:(expr errorString) position:pos1 to:tokenPosition.
+errorFlag := false. "ok, user wants it - so he'll get it"
+expr := BinaryNode receiver:receiver selector:sel arg:arg fold:nil.
+].
+expr lineNumber:lno.
+expr selectorPosition:pos1.
+self checkPlausibilityOf:expr from:pos1 to:pos2.
+receiver := expr.   "/ for next message
+].
+^ receiver
+"Modified: / 09-01-1998 / 19:05:18 / stefan"
+"Modified: / 14-02-2010 / 17:54:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 19-01-2012 / 10:46:49 / cg"
+!
 expression
 | node savedLastSelectorElement |
 savedLastSelectorElement := lastSelectorElement.
 lastSelectorElement := nil.
 ^node
 "Modified: / 19-01-2000 / 16:22:16 / cg"
 "Modified: / 16-02-2012 / 23:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 unaryExpressionFor:receiverArg
 "parse a unary-expression; return a node-tree, nil or #Error"
 |receiver expr sel pos pos2 lNr arguments savedLastSelectorElement|
 expr := MessageNode receiver:receiver selector:sel args:arguments fold:nil.
 ].
 lastSelectorElement node parent: expr.
 expr lineNumber:lNr.
 self checkPlausibilityOf:expr from:pos to:pos2.
-parseForCode ifFalse:[
-self rememberSelectorUsed:sel receiver:receiver
-].
 ^ expr.
 ].
 ].
 sel := self selectorCheck:sel for:receiver position:pos to:pos2.
 ].
 expr lineNumber:lNr.
 lastSelectorElement node parent: expr.
 self checkPlausibilityOf:expr from:pos to:pos2.
-parseForCode ifFalse:[
-self rememberSelectorUsed:sel receiver:receiver
-].
 receiver := expr.   "/ for next message
 ].
 lastSelectorElement := savedLastSelectorElement.
 ^ receiver
 ^node
 "Modified: / 19-01-2000 / 16:22:16 / cg"
 "Created: / 16-02-2012 / 22:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !SyntaxHighlighter2 methodsFor:'syntax detection'!
 markArgumentIdentifierFrom:pos1 to:pos2
 | node el prevEl |
 super markBadIdentifierFrom:pos1 to:pos2
 "Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 markLocalIdentifierFrom:pos1 to:pos2
 | node el prevEl |
 super markLocalIdentifierFrom:pos1 to:pos2.
 "Created: / 14-02-2010 / 17:40:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified (format): / 21-08-2011 / 09:18:21 / cg"
 "Modified: / 19-04-2012 / 09:53:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 markUnknownIdentifierFrom:pos1 to:pos2
 ignoreBadIdentifier == true ifTrue:[ ^ self ].
 super markUnknownIdentifierFrom:pos1 to:pos2
 "Created: / 31.3.1998 / 19:09:26 / cg"
 "Modified: / 31.3.1998 / 19:10:30 / cg"
 !
 rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2
 |element prev|
 prev := lastVariableElements at:name ifAbsent:[nil].
 (prev notNil and:[prev start == pos1]) ifTrue:[^ self].
 elements add: element.
 "Created: / 21-08-2011 / 09:26:24 / cg"
 ! !
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 version_CVS
-^ 'Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.10 2012/10/19 14:59:02 cg Exp '
+^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.10 2012-10-19 14:59:02 cg Exp $'
 !
 version_SVN
-^ '$Id: SyntaxHighlighter2.st 8074 2012-11-30 17:23:39Z vranyj1 $'
+^ '�Id: SyntaxHighlighter2.st 7715 2011-04-10 16:32:58Z vranyj1 �'
 ! !

branch	jv
changeset 12401	4714b9640528
parent 12308	5d9291c0fc27
parent 11859	16062221ec57
child 12406	1fbd331e4489