Issue #953: (prematurely) changed the method sort order to codePoint before realizing that I would be jeopardizing my ability the cleanly merge work from other branches ... so this branch should not be merged

Author: dalehenrich

rowan/src/Rowan-Core/RwModificationFiletreeWriterVisitorV2.class.st

@@ -123,7 +123,7 @@ RwModificationFiletreeWriterVisitorV2 >> _createFileNameMapForMethods: aMethodDe
 			put: (self _methodFileNameFor: def) ]
 		ifFalse: [ 
 		  "tack on postfix to guarantee  file names are unique on case insensitive file systems"
-		  sortedCol := col sort: [ :a :b | a selector asString _unicodeLessThan: b selector asString ].
+		  sortedCol := col sort: [ :a :b | (a selector asString codePointCompareTo: b selector asString) < 1 ].
 		  (1 to: sortedCol size) do: [ :index | 
 			| def filename |
 			def := sortedCol at: index.

rowan/src/Rowan-Core/RwModificationTonelWriterVisitorV2.class.st

@@ -235,15 +235,15 @@ RwModificationTonelWriterVisitorV2 >> _writeClassExtension: aClassExtension on:
 { #category : 'class writing' }
 RwModificationTonelWriterVisitorV2 >> _writeClassSideMethodDefinitions: aClassDefinition on: aStream [
 	((aClassDefinition classMethodDefinitions values )
-		sortWithBlock: [ :a :b | a selector _unicodeLessThan: b selector ])
+		sortWithBlock: [ :a :b | (a selector codePointCompareTo:  b selector) < 1 ])
 		do: [ :each | 
 			self _writeMethodDefinition: each classDefinition: aClassDefinition isMeta: true on: aStream ]
 ]
 
 { #category : 'class writing' }
 RwModificationTonelWriterVisitorV2 >> _writeInstanceSideMethodDefinitions: aClassDefinition on: aStream [
 	((aClassDefinition instanceMethodDefinitions values )
-		sortWithBlock: [ :a :b | a selector _unicodeLessThan: b selector ])
+		sortWithBlock: [ :a :b | (a selector codePointCompareTo:  b selector) < 1 ])
 		do: [ :each | 
 			self _writeMethodDefinition: each classDefinition: aClassDefinition isMeta: false on: aStream ]
 ]

rowan/src/Rowan-Core/RwModificationWriterVisitor.class.st

@@ -47,7 +47,7 @@ RwModificationWriterVisitor >> _createFileNameMapForClassesOrPackages: aClassOrP
 			put: def name ]
 		ifFalse: [ 
 		  "tack on postfix to guarantee  file names are unique on case insensitive file systems"
-		  sortedCol := col sort: [ :a :b | a asString _unicodeLessThan: b asString ].
+		  sortedCol := col sort: [ :a :b | (a asString codePointCompareTo: b asString) < 1 ].
 		  (1 to: sortedCol size) do: [ :index | 
 			| def filename |
 			def := sortedCol at: index.
@@ -201,13 +201,6 @@ RwModificationWriterVisitor >> visit: aPackageSetModification [
 	self export.
 ]
 
-{ #category : 'visiting' }
-RwModificationWriterVisitor >> visitClassesModification: aClassesModification [
-
-	aClassesModification elementsModified
-		do: [:each | each acceptVisitor: self]
-]
-
 { #category : 'visiting' }
 RwModificationWriterVisitor >> visitClassExtensionModification: aClassExtensionModification [
 
@@ -246,6 +239,13 @@ RwModificationWriterVisitor >> visitClassModification: aClassModification [
 
 ]
 
+{ #category : 'visiting' }
+RwModificationWriterVisitor >> visitClassesModification: aClassesModification [
+
+	aClassesModification elementsModified
+		do: [:each | each acceptVisitor: self]
+]
+
 { #category : 'visiting' }
 RwModificationWriterVisitor >> visitPackageModification: aPackageModification [
 
@@ -262,13 +262,6 @@ RwModificationWriterVisitor >> visitPackagesModification: aPackagesModification
 	aPackagesModification elementsModified do: [ :each | each acceptVisitor: self ]
 ]
 
-{ #category : 'visiting' }
-RwModificationWriterVisitor >> visitProjecteSetModification: aProjectSetModification [
-
-	aProjectSetModification elementsModified
-		do: [ :each | each acceptVisitor: self ]
-]
-
 { #category : 'visiting' }
 RwModificationWriterVisitor >> visitProjectModification: aProjectModification [
 
@@ -279,6 +272,13 @@ RwModificationWriterVisitor >> visitProjectModification: aProjectModification [
 	^ self changedProject: aProjectModification
 ]
 
+{ #category : 'visiting' }
+RwModificationWriterVisitor >> visitProjecteSetModification: aProjectSetModification [
+
+	aProjectSetModification elementsModified
+		do: [ :each | each acceptVisitor: self ]
+]
+
 { #category : 'visiting' }
 RwModificationWriterVisitor >> visitTraitModification: aTraitModification [
 	aTraitModification isAddition

rowan/src/Rowan-SpecificationsV2/RwProjectSpecificationV2.class.st

@@ -23,28 +23,6 @@ RwProjectSpecificationV2 class >> label [
 	^ 'project specification '
 ]
 
-{ #category : 'accessing' }
-RwProjectSpecificationV2 >> _repoType [
-	"direct access to IV ... used by ="
-
-	^ repoType
-]
-
-{ #category : 'private' }
-RwProjectSpecificationV2 >> _validate [
-	"ensure that the data structures within the receiver contain valid information:
-		1. platform implementation is responsible for validating platform structures"
-
-	#(#'componentsPath' #'packagesPath' #'projectsPath' #'specsPath' #'projectName' #'specName' #'projectSpecPath')
-		do: [ :messageName | 
-			(self perform: messageName)
-				ifNil: [ 
-					Error
-						signal:
-							'The instance variable ' , messageName asString printString , ' cannot be nil' ] ].
-	^ true
-]
-
 { #category : 'comparing' }
 RwProjectSpecificationV2 >> = anObject [
 	| lazyEqual |
@@ -72,6 +50,28 @@ RwProjectSpecificationV2 >> = anObject [
 																				and: [ self loadedCommitId = anObject loadedCommitId ] ] ] ] ] ] ] ] ] ]
 ]
 
+{ #category : 'accessing' }
+RwProjectSpecificationV2 >> _repoType [
+	"direct access to IV ... used by ="
+
+	^ repoType
+]
+
+{ #category : 'private' }
+RwProjectSpecificationV2 >> _validate [
+	"ensure that the data structures within the receiver contain valid information:
+		1. platform implementation is responsible for validating platform structures"
+
+	#(#'componentsPath' #'packagesPath' #'projectsPath' #'specsPath' #'projectName' #'specName' #'projectSpecPath')
+		do: [ :messageName | 
+			(self perform: messageName)
+				ifNil: [ 
+					Error
+						signal:
+							'The instance variable ' , messageName asString printString , ' cannot be nil' ] ].
+	^ true
+]
+
 { #category : 'accessing' }
 RwProjectSpecificationV2 >> comment [
 	^ comment ifNil: [ ^ '' ]
@@ -158,14 +158,25 @@ RwProjectSpecificationV2 >> packageConvention [
 ]
 
 { #category : 'accessing' }
-RwProjectSpecificationV2 >> packageConvention: aString [
+RwProjectSpecificationV2 >> packageConvention: aStringOrNil [
 	"
 		RowanHybrid	- [default] Class category is package name, method protocol with leading $* is case insensitive package name
 		Monticello		- Class category is package name, method protocol with leading $* begins with case insensitive package name
 		Rowan			- Class category and method protocol are not overloaded with packaging information
 	"
 
-	packageConvention := aString
+	aStringOrNil
+		ifNil: [ 
+			packageConvention := nil.
+			^ self ].
+	(#('RowanHybrid' 'Monticello' 'Rowan') includes: aStringOrNil)
+		ifFalse: [ 
+			self
+				error:
+					'project specification packageConventions field is ' , aStringOrNil printString
+						, ' legal values are: nil, ''RowanHybrid'',  ''Monticello'', or ''Rowan''' ].
+
+	packageConvention := aStringOrNil
 ]
 
 { #category : 'accessing' }
@@ -220,17 +231,6 @@ RwProjectSpecificationV2 >> projectName: aString [
 	projectName := aString
 ]
 
-{ #category : 'accessing' }
-RwProjectSpecificationV2 >> projectsPath [
-
-	^ projectsPath
-]
-
-{ #category : 'accessing' }
-RwProjectSpecificationV2 >> projectsPath: aString [
-	projectsPath := aString
-]
-
 { #category : 'accessing' }
 RwProjectSpecificationV2 >> projectSpecPath [
 
@@ -254,6 +254,17 @@ RwProjectSpecificationV2 >> projectVersion: aStringOrVersion [
 	"noop for now"
 ]
 
+{ #category : 'accessing' }
+RwProjectSpecificationV2 >> projectsPath [
+
+	^ projectsPath
+]
+
+{ #category : 'accessing' }
+RwProjectSpecificationV2 >> projectsPath: aString [
+	projectsPath := aString
+]
+
 { #category : 'accessing' }
 RwProjectSpecificationV2 >> repoType [
 	^ repoType ifNil: [ repoType := #disk ]
@@ -264,7 +275,11 @@ RwProjectSpecificationV2 >> repoType: aSymbol [
 	"#disk, #git or #none"
 
 	(#(#'disk' #'git' #'none') includes: aSymbol asSymbol)
-		ifFalse: [ self error: 'Unknown repo type ' , aSymbol asSymbol printString ].
+		ifFalse: [ 
+			self
+				error:
+					'Unknown repo type ' , aSymbol asSymbol printString
+						, 'expecting ''disk'', ''git'', or ''none''' ].
 	^ repoType := aSymbol asSymbol
 ]
 

rowan/src/Rowan-SpecificationsV2/RwProjectSpecificationV3.class.st

@@ -2,11 +2,23 @@ Class {
 	#name : 'RwProjectSpecificationV3',
 	#superclass : 'RwProjectSpecificationV2',
 	#instVars : [
-		'projectVersion'
+		'projectVersion',
+		'methodSortOrder'
 	],
 	#category : 'Rowan-SpecificationsV2'
 }
 
+{ #category : 'ston' }
+RwProjectSpecificationV3 class >> fromSton: stonReader [
+	"Create a new instance and delegate decoding to instance side.
+	Override only when new instance should be created directly (see implementors). "
+	
+	^ self basicNew
+		initializeForSton;
+		fromSton: stonReader;
+		yourself
+]
+
 { #category : 'comparing' }
 RwProjectSpecificationV3 >> = anObject [
 	^ super = anObject and: [ self projectVersion = anObject projectVersion ]
@@ -38,12 +50,41 @@ RwProjectSpecificationV3 >> initialize [
 	packagesPath := 'src'.
 	projectVersion := '1.0.0'.
 	packageConvention := 'RowanHybrid'.
-	packageFormat := 'tonel'
+	packageFormat := 'tonel'.
+	methodSortOrder := 'codePoint' "when creating a new project from scratch `codePoint` is default (see initializeForSton)"
+]
+
+{ #category : 'initialization' }
+RwProjectSpecificationV3 >> initializeForSton [
+	"default value for methodSortOrder depends upon whether or not `methodSortOrder` is explicitly specified or not"
+
+	self initialize.
+	methodSortOrder := 'unicode'	"when loading from STON and methodSortOrder is not explicitly set in ston file, `unicode` is default (""https://github.com/GemTalk/Rowan/issues/953"")"
 ]
 
 { #category : 'ston' }
 RwProjectSpecificationV3 >> instVarNamesInOrderForSton [
-	^ #(#'specName' #'projectName' #'projectVersion' #'projectSpecPath' #'componentsPath' #'packagesPath' #'projectsPath' #'specsPath' #'packageFormat' #'packageConvention' #'comment' #'repoType' #'loadedCommitId')
+	^ #(#'specName' #'projectName' #'projectVersion' #'projectSpecPath' #'componentsPath' #'packagesPath' #'projectsPath' #'specsPath' #'packageFormat' #'packageConvention' #'methodSortOrder' #'comment' #'repoType' #'loadedCommitId')
+]
+
+{ #category : 'accessing' }
+RwProjectSpecificationV3 >> methodSortOrder [
+	^ methodSortOrder
+]
+
+{ #category : 'accessing' }
+RwProjectSpecificationV3 >> methodSortOrder: aStringOrNil [
+	aStringOrNil
+		ifNil: [ 
+			methodSortOrder := nil.
+			^ self ].
+	(#('codePoint' 'unicode') includes: aStringOrNil)
+		ifFalse: [ 
+			self
+				error:
+					'project specification sortOrder field is ' , aStringOrNil printString
+						, ' legal values are: nil, ''codePoint'', or ''unicode''' ].
+	methodSortOrder := aStringOrNil
 ]
 
 { #category : 'accessing' }

rowan/src/Rowan-Tonel-Core/RwTonelParser.class.st

@@ -172,10 +172,10 @@ RwTonelParser >> checkTonelClassMethodOrder: aBoolean [
 		ifTrue: [ 
 			self
 				dynamicInstVarAt: #'checkTonelInstanceSelectors'
-				put: (SortedCollection sortBlock: [ :a :b | a _unicodeLessThan: b ]).
+				put: (SortedCollection sortBlock: [ :a :b | (a codePointCompareTo: b ) < 1]).
 			self
 				dynamicInstVarAt: #'checkTonelClassSelectors'
-				put: (SortedCollection sortBlock: [ :a :b | a _unicodeLessThan: b ]) ]
+				put: (SortedCollection sortBlock: [ :a :b | (a codePointCompareTo: b) < 1 ]) ]
 ]
 
 { #category : 'private' }