BIG MOVING IN, all the v2 is now in the lexer directory. PTGLK

Eclalang · Feb 28, 2024 · 9040f50 · 9040f50
1 parent cc54bfa
commit 9040f50
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 2,319 deletions.
diff --git a/lexer/v2/IToken.go → lexer/IToken.go b/lexer/v2/IToken.go → lexer/IToken.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type ITokenType interface {
 	// Resolve use the actual l *TLexer to create a new Token. the lexer is ready for the next step when the resolve end

diff --git a/lexer/v2/Lexer.go → lexer/Lexer.go b/lexer/v2/Lexer.go → lexer/Lexer.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 import "strconv"
 
@@ -207,12 +207,9 @@ func LexerR(sentence string) []Token {
 	Lex.Step()
 	Lex.tempVal = Lex.sentence[Lex.prevIndex:Lex.index]
 	if Lex.tempVal != "" {
-		if Lex.TriggerBy != "" {
-			//findNameInEveryTokenType(Lex.TriggerBy, Every).Resolve(Lex)
-			Lex.AddToken(Lex.TriggerBy + " FIN")
-		} else {
-			Lex.AddToken(TEXT)
-		}
+
+		Lex.AddToken(TEXT)
+
 		Lex.tempVal = ""
 	}
 	Lex.AddToken(EOF)

diff --git a/lexer/v2/TokenTypeBase.go → lexer/TokenTypeBase.go b/lexer/v2/TokenTypeBase.go → lexer/TokenTypeBase.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type TokenTypeBaseBehavior struct {
 	Name   string

diff --git a/lexer/v2/TokenTypeComposite.go → lexer/TokenTypeComposite.go b/lexer/v2/TokenTypeComposite.go → lexer/TokenTypeComposite.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type TokenTypeCompositeBehavior struct {
 	Name string

diff --git a/lexer/v2/TokenTypeMerger.go → lexer/TokenTypeMerger.go b/lexer/v2/TokenTypeMerger.go → lexer/TokenTypeMerger.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type TokenTypeMergerBehavior struct {
 	Name   string
@@ -36,7 +36,10 @@ func (t *TokenTypeMergerBehavior) Resolve(l *TLexer) {
 			(*l).isSpaces = false
 		}
 		if index == -1 {
-			if l.sizeOfTokenReversed != -1 {
+			if l.index >= len(l.sentence) {
+				l.AddToken(t.Result[0].Name)
+				l.prevIndex = l.index
+			} else if l.sizeOfTokenReversed != -1 {
 				identified := l.tempVal[len(l.tempVal)-l.sizeOfTokenReversed:]
 				indexOfClose := t.IsClosedBySyntaxe(identified)
 				if indexOfClose != -1 {

diff --git a/lexer/v2/TokenTypeSpaces.go → lexer/TokenTypeSpaces.go b/lexer/v2/TokenTypeSpaces.go → lexer/TokenTypeSpaces.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type TokenTypeSpacesBehavior struct {
 	Name   string
@@ -19,7 +19,7 @@ func (t *TokenTypeSpacesBehavior) Resolve(l *TLexer) {
 		}
 		if t.Name == "\n" {
 			(*l).line++
-			(*l).position = 0
+			(*l).position = 1
 		}
 
 		l.prevIndex = l.index

diff --git a/lexer/v2/TokenTypeTrigger.go → lexer/TokenTypeTrigger.go b/lexer/v2/TokenTypeTrigger.go → lexer/TokenTypeTrigger.go
@@ -1,4 +1,4 @@
-package v2
+package lexer
 
 type TokenTypeTriggerBehavior struct {
 	Name   string
@@ -18,7 +18,10 @@ func (t *TokenTypeTriggerBehavior) Resolve(l *TLexer) {
 		(*l).AddToken(t.Name)
 		l.prevIndex = l.index
 	} else {
-		if l.sizeOfTokenReversed != -1 {
+		if l.index >= len(l.sentence) {
+			l.AddToken(t.Result[0].Name)
+			l.prevIndex = l.index
+		} else if l.sizeOfTokenReversed != -1 {
 			identified := l.tempVal[len(l.tempVal)-l.sizeOfTokenReversed:]
 			indexOfClose := t.IsClosedBySyntaxe(identified)
 			if indexOfClose != -1 {
@@ -78,10 +81,10 @@ var (
 			"\"",
 		},
 		CloseBy: []ITokenType{
-			&SELF,
+			&SELF, &RETURN,
 		},
 		Result: []TokenTypeCompositeBehavior{
-			CSTRING,
+			CSTRING, CSTRING,
 		},
 	}
 	TSQUOTE = TokenTypeTriggerBehavior{
@@ -90,10 +93,10 @@ var (
 			"'",
 		},
 		CloseBy: []ITokenType{
-			&SELF,
+			&SELF, &RETURN,
 		},
 		Result: []TokenTypeCompositeBehavior{
-			CCHAR,
+			CCHAR, CCHAR,
 		},
 	}
 )