Changed TokenPatternParser to parse from string rather from literal array.
The literal array syntax was ambiguous and no way easier to read.
"{ Package: 'jv:smallsense' }"
"{ NameSpace: SmallSense }"
Regex::RxParser subclass:#TokenPatternParser
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'SmallSense-Utils-Matcher'
!
Regex::RxCharSetParser subclass:#TokenSpecParser
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
privateIn:TokenPatternParser
!
!TokenPatternParser class methodsFor:'documentation'!
documentation
"
A parser to parse token patterns
[author:]
Jan Vrany <jan.vrany@fit.cvut.cz>
[instance variables:]
[class variables:]
[see also:]
"
! !
!TokenPatternParser class methodsFor:'parsing'!
parse: anArrayOrStream
^ self new parse: anArrayOrStream
"Created: / 02-05-2014 / 18:56:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TokenPatternParser methodsFor:'private'!
characterSetFrom: setSpec
"<setSpec> is what goes between the brackets in a charset regex
(a String). Make a string containing all characters the spec specifies.
Spec is never empty."
| negated spec |
spec := ReadStream on: setSpec.
spec peek = $^
ifTrue: [negated := true.
spec next]
ifFalse: [negated := false].
^ TokenPatternTokenSet new
initializeElements: (TokenSpecParser on: spec) parse
negated: negated
"Created: / 09-05-2014 / 15:48:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TokenPatternParser methodsFor:'recursive descent'!
atom
| atom |
atom := super atom.
(atom isKindOf:Regex::RxsCharacter) ifTrue:[
atom := TokenPatternToken new type:atom character.
].
^ atom
"Created: / 09-05-2014 / 15:56:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TokenPatternParser::TokenSpecParser methodsFor:'parsing'!
parseNamedSet
| type value done out |
self
match:$[;
match:$:.
done := false.
out := '' writeStream.
[ done ] whileFalse:[
lookahead == $\ ifTrue:[
"/ Escape sequence
lookahead := source next.
out nextPut: lookahead.
] ifFalse:[
lookahead == $: ifTrue:[
done := true.
] ifFalse:[
lookahead == $= ifTrue:[
type := out contents.
out reset.
] ifFalse:[
out nextPut: lookahead.
].
].
].
lookahead := source next.
].
type isNil ifTrue:[
type := out contents.
] ifFalse:[
value := out contents.
].
self match:$].
elements add:((TokenPatternToken new)
type:type;
value:value)
"Modified: / 09-05-2014 / 16:35:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !