First version with MicInlineSpaceBlock and tests

pillar-markup · Oct 1, 2024 · e4f4ddd · e4f4ddd
1 parent 634eab9
commit e4f4ddd
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 12 deletions.
diff --git a/src/Microdown-Tests/MicInlineSpaceBlockTest.class.st b/src/Microdown-Tests/MicInlineSpaceBlockTest.class.st
@@ -17,5 +17,15 @@ MicInlineSpaceBlockTest >> testParagraphWithInlineSpace [
 	| root |
 	root := self parser parse: 'a paragraph with an inline space here <br> it continues after here.'.
 	self assert: root children size equals: 1.
-	self assert: root children first children size equals: 3
+	self assert: root children first children size equals: 3.
+	self assert: root children first children second class equals: MicInlineSpaceBlock 
+]
+
+{ #category : 'tests' }
+MicInlineSpaceBlockTest >> testParagraphWithInlineSpaceAndOthers [
+
+	| root |
+	root := self parser parse: '_a paragraph_ with an *inline* space here <br> it continues after here.'.
+	self assert: root children size equals: 1.
+	self assert: root children first children size equals: 6
 ]
diff --git a/src/Microdown-Tests/MicInlineTokenStreamTest.class.st b/src/Microdown-Tests/MicInlineTokenStreamTest.class.st
@@ -92,7 +92,16 @@ MicInlineTokenStreamTest >> testTokenize_InlineSpace [
 
 	| tokens | 
 	tokens := (MicInlineTokenStream on: 'aa', InlineSpace ,'bbb') contents.
-	self assert: tokens second string equals: (InlineSpace ,'bbb').
+	self assert: tokens second string equals: InlineSpace.
+	self assert: tokens second delimiter equals: (MicInlineDelimiter at: InlineSpace)
+]
+
+{ #category : 'tests' }
+MicInlineTokenStreamTest >> testTokenize_InlineSpaceWithSpaceAround [
+
+	| tokens | 
+	tokens := (MicInlineTokenStream on: 'aa ', InlineSpace ,' bbb') contents.
+	self assert: tokens second string equals: InlineSpace.
 	self assert: tokens second delimiter equals: (MicInlineDelimiter at: InlineSpace)
 ]
 

diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
@@ -131,6 +131,11 @@ MicInlineDelimiter >> markupAsRegex [
 	self subclassResponsibility
 ]
 
+{ #category : 'printing' }
+MicInlineDelimiter >> printOn: stream [
+	stream << $« << self markup << $»
+]
+
 { #category : 'adding' }
 MicInlineDelimiter >> storeRegex [
 

diff --git a/src/Microdown/MicInlineParser.class.st b/src/Microdown/MicInlineParser.class.st
@@ -62,7 +62,8 @@ MicInlineParser >> joinTextNodesOf: children [
 
 { #category : 'parsing' }
 MicInlineParser >> parse: aString [
-	"I return an array of inline blocks"
+	"Returns an array of inline blocks"
+
 	| tokenStream |
 	tokenStream := MicInlineTokenStream on: aString.
 	^ (self parseChildrenIn: tokenStream) asArray 

diff --git a/src/Microdown/MicInlineSpaceBlock.class.st b/src/Microdown/MicInlineSpaceBlock.class.st
@@ -6,6 +6,12 @@ Class {
 	#tag : 'InlineParser'
 }
 
+{ #category : 'parsing' }
+MicInlineSpaceBlock class >> parse: delimiter stream: aTokenStream for: aParser [
+
+	^ self new
+]
+
 { #category : 'visiting' }
 MicInlineSpaceBlock >> accept: aVisitor [
 

diff --git a/src/Microdown/MicInlineSpaceDelimiter.class.st b/src/Microdown/MicInlineSpaceDelimiter.class.st
@@ -0,0 +1,55 @@
+Class {
+	#name : 'MicInlineSpaceDelimiter',
+	#superclass : 'MicInlineDelimiter',
+	#pools : [
+		'MicSharedPool'
+	],
+	#category : 'Microdown-InlineParser',
+	#package : 'Microdown',
+	#tag : 'InlineParser'
+}
+
+{ #category : 'initialization' }
+MicInlineSpaceDelimiter class >> initializeDelimiters [
+
+	"line break"
+	self new  addMe
+
+
+
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> blockClass [
+
+	^ MicInlineSpaceBlock
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> isEvaluated [
+
+	^ false
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> isOpener [
+
+	^ true
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> isRawkind [
+
+	^ false
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> markup [ 
+	^ InlineSpace 
+]
+
+{ #category : 'accessing' }
+MicInlineSpaceDelimiter >> markupAsRegex [
+
+	^ InlineSpace
+]
diff --git a/src/Microdown/MicInlineStandardDelimiter.class.st b/src/Microdown/MicInlineStandardDelimiter.class.st
@@ -49,9 +49,6 @@ MicInlineStandardDelimiter class >> initializeDelimiters [
 	self new markup: NameCloserUrlOpener; blockClass: MicRawBlock ; closer: URLCloserMarkup; addMe.
 	self new markup: URLCloserMarkup; blockClass: nil ; closer: nil; addMe.
 
-	"line break"
-	self new markup: InlineSpace; blockClass: MicInlineSpaceBlock; closer: nil; addMe
-
 
 
 ]
@@ -105,8 +102,3 @@ MicInlineStandardDelimiter >> markupAsRegex [
 		ifFalse: [ markup do: [ :char| str nextPut: $\; nextPut: char ] ].
 	^ str contents
 ]
-
-{ #category : 'printing' }
-MicInlineStandardDelimiter >> printOn: stream [
-	stream << $« << markup << $»
-]
diff --git a/src/Microdown/MicInlineTokenStream.class.st b/src/Microdown/MicInlineTokenStream.class.st
@@ -110,6 +110,8 @@ MicInlineTokenStream >> addText: matchedString [
 
 { #category : 'initialization' }
 MicInlineTokenStream >> initialize [
+
+	super initialize.
 	tokens := OrderedCollection new
 ]
 

diff --git a/src/Microdown/MicSharedPool.class.st b/src/Microdown/MicSharedPool.class.st
@@ -100,6 +100,8 @@ MicSharedPool class >> initialize [
    UnorderedListPlusMarkup := '+ '.
 	UnorderedListStarMarkup := '* '.
 
+	self initializeRawParagraph.
+
 "Argument list"
 
 	ArgumentListDelimiter := '&'.
@@ -131,7 +133,7 @@ MicSharedPool class >> initialize [
 	NameCloserUrlOpener := ']('.
 	FixiousTextDelimiter := 0 asCharacter asString.
 
-	self initializeRawParagraph.
+
 
 
 	Delimiters := { AnchorReferenceCloserMarkup . 

diff --git a/src/Microdown/MicrodownParser.class.st b/src/Microdown/MicrodownParser.class.st
@@ -190,6 +190,7 @@ MicrodownParser class >> builder [
 { #category : 'examples' }
 MicrodownParser class >> example [
 	<sampleInstance>
+
 	^ self parse: self comment
 ]