Issue #465: fix regression in testMethod ... 11 run, 10 passed, 1 fai…

…lures, 0 errors
GemTalk · Jul 24, 2019 · c183765 · c183765
1 parent 289a0b6
commit c183765
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/rowan/configs/Load.ston b/rowan/configs/Load.ston
@@ -31,12 +31,12 @@ RwProjectLoadConfiguration {
  #conditionalPackageMapSpecs : {
  'gemstone' : {
  'allusers' : {
- #defaultUseSessionMethodsForExtensions : false,
- #defaultSymbolDictName : 'UserGlobals'
+ #defaultSymbolDictName : 'UserGlobals',
+ #defaultUseSessionMethodsForExtensions : false
  },
  'SystemUser' : {
- #defaultUseSessionMethodsForExtensions : false,
- #defaultSymbolDictName : 'RowanKernel'
+ #defaultSymbolDictName : 'RowanKernel',
+ #defaultUseSessionMethodsForExtensions : false
  }
  }
  },

diff --git a/rowan/src/AST-Core/RBParser.class.st b/rowan/src/AST-Core/RBParser.class.st
@@ -720,24 +720,6 @@ RBParser >> parseStatements: pragmaBoolean [
  rightBar: rightBar)
 ]
 
-{ #category : 'private-parsing' }
-RBParser >> parseTonelKeywordPattern [
- | keywords args node |
- keywords := OrderedCollection new.
- args := OrderedCollection new.
- [currentToken isKeyword]
- whileTrue:
- [keywords add: currentToken.
- self step.
- args add: self parseVariableNode].
- node := self methodNodeClass
- selectorParts: keywords
- arguments: args.
- node comments: (node comments, args last comments).
- args last comments: nil.
- ^node
-]
-
 { #category : 'private-parsing' }
 RBParser >> parseTonelMessagePattern [
 
@@ -746,7 +728,7 @@ RBParser >> parseTonelMessagePattern [
  ifTrue: [self parseTonelUnaryPattern]
  ifFalse: 
  [currentToken isKeyword 
- ifTrue: [self parseTonelKeywordPattern]
+ ifTrue: [self parseKeywordPattern]
  ifFalse: [self parseTonelBinaryPattern]]
 ]
 

diff --git a/rowan/src/Rowan-Components/NewTonelParser.class.st b/rowan/src/Rowan-Components/NewTonelParser.class.st
@@ -12,10 +12,6 @@ Class {
 { #category : 'parsing' }
 NewTonelParser >> method [
 
-"this is what we're looking for:
- self copyFrom: 37 to: 41
- 'name '
-"
  | type start end currentPosition selector count xStart |
 
  type := self untilIncluding: '>>'.
@@ -29,7 +25,7 @@ end := methodParser scanner stream position.
  start := methodBodyStart := methodParser scanner previousStepPosition - 3.
  currentPosition := methodParser scanner stream position.
  methodParser scanner stream position: xStart.
-count := end - start.
+count := end - xStart + 1.
 selector := String new: count.
  methodParser scanner stream readInto: selector startingAt: 1 count: count.
  methodParser scanner stream position: currentPosition.

diff --git a/rowan/src/Rowan-Tests/NewTonelParserTest.class.st b/rowan/src/Rowan-Tests/NewTonelParserTest.class.st
@@ -115,6 +115,7 @@ NewTonelParserTest >> testMetadata [
 
 { #category : 'tests' }
 NewTonelParserTest >> testMethod [
+
  self 
  assertParse: 'Object>>name' 
  rule: #method
@@ -131,7 +132,6 @@ false ifTrue: [ "I'm not sure that this pattern will show up in the wild ...so i
  rule: #method
  equals: #(('Object' nil) 'name: aString').
 ].
-
  self 
  assertParse: 'Object class >> name: aString' 
  rule: #method