NumberParser as standalone package

jecisc · Nov 2, 2019 · 7ad5f86 · 7ad5f86
1 parent 70d198b
commit 7ad5f86
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 40 deletions.
diff --git a/src/AST-Core/ASTCache.class.st b/src/AST-Core/ASTCache.class.st
@@ -37,20 +37,16 @@ ASTCache class >> at: aCompiledMethod [
 
 { #category : #accessing }
 ASTCache class >> default [
-	^ default
+	^ default ifNil: [ 
+		SessionManager default registerSystemClassNamed: self name.
+		default := self new ]
 ]
 
 { #category : #accessing }
 ASTCache class >> default: anASTCache [
 	default := anASTCache
 ]
 
-{ #category : #'class initialization' }
-ASTCache class >> initialize [
-	default := self new.
-	SessionManager default registerSystemClassNamed: self name
-]
-
 { #category : #initialization }
 ASTCache class >> reset [
 	<script>

diff --git a/src/AST-Core/Integer.extension.st b/src/AST-Core/Integer.extension.st
@@ -7,18 +7,6 @@ Integer class >> readFrom: aStringOrStream [
 	^self readFrom: aStringOrStream base: 10
 ]
 
-{ #category : #'*AST-Core-Parser' }
-Integer class >> readFrom: aStringOrStream base: base [ 
-	"Answer an instance of one of the concrete subclasses if Integer. 
-	Initial minus sign accepted, and bases > 10 use letters A-Z.
-	Imbedded radix specifiers not allowed;  use Number 
-	class readFrom: for that.
-	Raise an Error if there are no digits.
-	If stringOrStream dos not start with a valid number description, answer 0 for backward compatibility. This is not clever and should better be changed."
-
-	^(NumberParser on: aStringOrStream) nextIntegerBase: base
-]
-
 { #category : #'*AST-Core-Parser' }
 Integer class >> readFrom: aStringOrStream ifFail: aBlock [
 	"Answer an instance of one of the concrete subclasses if Integer. 

diff --git a/src/AST-Core/Number.extension.st b/src/AST-Core/Number.extension.st
@@ -11,14 +11,6 @@ Number class >> readFrom: stringOrStream [
 	^(NumberParser on: stringOrStream) nextNumber
 ]
 
-{ #category : #'*AST-Core-Parser' }
-Number class >> readFrom: stringOrStream base: base [
-	"Answer a number as described on aStream in the given number base.
-	If stringOrStream does not start with a valid number description, answer 0 for backward compatibility. This is not clever and should better be changed."
-
-	^(NumberParser on: stringOrStream) nextNumberBase: base
-]
-
 { #category : #'*AST-Core-Parser' }
 Number class >> readFrom: stringOrStream ifFail: aBlock [
 	"Answer a number as described on aStream.  The number may

diff --git a/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st b/src/BaselineOfPharoBootstrap/BaselineOfPharoBootstrap.class.st
@@ -96,6 +96,7 @@ BaselineOfPharoBootstrap >> baseline: spec [
 		spec package: 'Kernel'.
 		spec package: 'Kernel-BytecodeEncoders'.
 		spec package: 'Kernel-Chronology-Extras'.
+		spec package: 'NumberParser'.
 
 		spec package: 'Math-Operations-Extensions'.
 
@@ -188,6 +189,7 @@ BaselineOfPharoBootstrap >> baseline: spec [
 			'System-SessionManager'.
 			'System-Sources'.
 			'System-Support'.
+			'NumberParser'.
 
 			'UIManager'.
 			'Zinc-Character-Encoding-Core' }.

diff --git a/src/Collections-Strings/ManifestCollectionsStrings.class.st b/src/Collections-Strings/ManifestCollectionsStrings.class.st
@@ -14,7 +14,7 @@ ManifestCollectionsStrings class >> dependencies [
 
 { #category : #'meta-data - dependency analyser' }
 ManifestCollectionsStrings class >> manuallyResolvedDependencies [
-	^ #(#'System-Support' #'AST-Core' #'OpalCompiler-Core')
+	^ #(#'System-Support' #'OpalCompiler-Core')
 ]
 
 { #category : #'meta-data' }

diff --git a/src/Colors/ManifestColors.class.st b/src/Colors/ManifestColors.class.st
@@ -9,5 +9,5 @@ Class {
 
 { #category : #'meta-data - dependency analyser' }
 ManifestColors class >> manuallyResolvedDependencies [
-	^ #(#'Collections-Streams' #'AST-Core')
+	^ #(#'Collections-Streams')
 ]
diff --git a/src/Kernel/ManifestKernel.class.st b/src/Kernel/ManifestKernel.class.st
@@ -19,7 +19,7 @@ ManifestKernel class >> ignoredDependencies [
 
 { #category : #'meta-data - dependency analyser' }
 ManifestKernel class >> manuallyResolvedDependencies [
-	^ #(#'System-Settings-Core' #'System-Sources' #'System-Platforms' #'Multilingual-TextConversion' #'AST-Core' #'Shift-ClassBuilder' #'Regex-Core' #'RPackage-Core' #'Zinc-Character-Encoding-Core' #Reflectivity #'Shift-ClassInstaller' #'FFI-Kernel')
+	^ #(#'System-Settings-Core' #'System-Sources' #'System-Platforms' #'Multilingual-TextConversion' #'Shift-ClassBuilder' #'Regex-Core' #'RPackage-Core' #'Zinc-Character-Encoding-Core' #Reflectivity #'Shift-ClassInstaller' #'FFI-Kernel')
 ]
 
 { #category : #'meta-data' }

diff --git a/src/Multilingual-Encodings/ManifestMultilingualEncodings.class.st b/src/Multilingual-Encodings/ManifestMultilingualEncodings.class.st
@@ -9,5 +9,5 @@ Class {
 
 { #category : #'meta-data - dependency analyser' }
 ManifestMultilingualEncodings class >> manuallyResolvedDependencies [
-	^ #(#'Multilingual-TextConversion' #'AST-Core' #'Collections-Streams' #'Collections-Abstract')
+	^ #(#'Multilingual-TextConversion' #'Collections-Streams' #'Collections-Abstract')
 ]
diff --git a/src/Network-UUID/ManifestNetworkUUID.class.st b/src/Network-UUID/ManifestNetworkUUID.class.st
@@ -14,5 +14,5 @@ ManifestNetworkUUID class >> ignoredDependencies [
 
 { #category : #'meta-data - dependency analyser' }
 ManifestNetworkUUID class >> manuallyResolvedDependencies [
-	^ #(#'AST-Core' #'Collections-Abstract')
+	^ #(#'Collections-Abstract')
 ]
diff --git a/src/NumberParser/Integer.extension.st b/src/NumberParser/Integer.extension.st
@@ -0,0 +1,13 @@
+Extension { #name : #Integer }
+
+{ #category : #'*NumberParser' }
+Integer class >> readFrom: aStringOrStream base: base [ 
+	"Answer an instance of one of the concrete subclasses if Integer. 
+	Initial minus sign accepted, and bases > 10 use letters A-Z.
+	Imbedded radix specifiers not allowed;  use Number 
+	class readFrom: for that.
+	Raise an Error if there are no digits.
+	If stringOrStream dos not start with a valid number description, answer 0 for backward compatibility. This is not clever and should better be changed."
+
+	^(NumberParser on: aStringOrStream) nextIntegerBase: base
+]
diff --git a/src/NumberParser/ManifestNumberParser.class.st b/src/NumberParser/ManifestNumberParser.class.st
@@ -0,0 +1,8 @@
+"
+NumberParser is parsing and building numbers from string/stream.
+"
+Class {
+	#name : #ManifestNumberParser,
+	#superclass : #PackageManifest,
+	#category : #'NumberParser-Manifest'
+}
diff --git a/src/NumberParser/Number.extension.st b/src/NumberParser/Number.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #Number }
+
+{ #category : #'*NumberParser' }
+Number class >> readFrom: stringOrStream base: base [
+	"Answer a number as described on aStream in the given number base.
+	If stringOrStream does not start with a valid number description, answer 0 for backward compatibility. This is not clever and should better be changed."
+
+	^(NumberParser on: stringOrStream) nextNumberBase: base
+]
diff --git a/src/AST-Core/NumberParser.class.st → src/NumberParser/NumberParser.class.st b/src/AST-Core/NumberParser.class.st → src/NumberParser/NumberParser.class.st
@@ -33,7 +33,7 @@ Class {
 		'requestor',
 		'failBlock'
 	],
-	#category : #'AST-Core-Parser'
+	#category : #NumberParser
 }
 
 { #category : #testing }

diff --git a/src/NumberParser/package.st b/src/NumberParser/package.st
@@ -0,0 +1 @@
+Package { #name : #NumberParser }
diff --git a/src/PharoBootstrap-Initialization/ManifestPharoBootstrapInitialization.class.st b/src/PharoBootstrap-Initialization/ManifestPharoBootstrapInitialization.class.st
@@ -14,7 +14,7 @@ ManifestPharoBootstrapInitialization class >> ignoredDependencies [
 
 { #category : #'meta-data - dependency analyser' }
 ManifestPharoBootstrapInitialization class >> manuallyResolvedDependencies [
-	^ #(#'System-Finalization' #'SUnit-Core')
+	^ #(#'System-Finalization')
 ]
 
 { #category : #'meta-data - dependency analyser' }

diff --git a/src/PharoBootstrap-Initialization/PharoBootstrapInitialization.class.st b/src/PharoBootstrap-Initialization/PharoBootstrapInitialization.class.st
@@ -68,10 +68,7 @@ PharoBootstrapInitialization class >> initializeCommandLineHandlerAndErrorHandli
 	Smalltalk sourceFileVersionString: 'PharoV60'.
 	(Smalltalk class classVariableNamed: 'LastImagePath') value: Smalltalk imagePath. "set the default value"
 	SourceFiles := SourceFileArray new.
-
-	"Create the ASTCache and add it to the startup list"
-	ASTCache initialize.
-
+
 	Color initialize.
 	InstructionStream initialize.
 	SmallInteger initialize.

diff --git a/src/System-DependenciesTests/SystemDependenciesTest.class.st b/src/System-DependenciesTests/SystemDependenciesTest.class.st
@@ -101,7 +101,7 @@ SystemDependenciesTest >> knownKernelDependencies [
 
 	"ideally this list should be empty"	
 
-	^ #(#'FileSystem-Core' #'OpalCompiler-Core' #'System-Changes' #'AST-Core')
+	^ #(#'FileSystem-Core' #'OpalCompiler-Core' #'System-Changes')
 ]
 
 { #category : #'known dependencies' }

diff --git a/src/System-Hashing/ManifestSystemHashing.class.st b/src/System-Hashing/ManifestSystemHashing.class.st
@@ -9,6 +9,6 @@ Class {
 
 { #category : #'meta-data - dependency analyser' }
 ManifestSystemHashing class >> manuallyResolvedDependencies [
-	^ #(#'Collections-Streams' #'System-Platforms' #'OpalCompiler-Core' #'AST-Core' #'Collections-Abstract')
+	^ #(#'Collections-Streams' #'System-Platforms' #'OpalCompiler-Core' #'Collections-Abstract')
 
 ]