summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Gunger <kgunger12@gmail.com>2022-03-15 15:26:35 -0400
committerKyle Gunger <kgunger12@gmail.com>2022-03-15 15:26:35 -0400
commitd581c7503f20a8b560a98e521daec632c763c56c (patch)
treef6e2e5f8d0f40734fb3a124aee4734a0c99e4bd1
parenta2f399fdd922495dcac60f4f4601a9729b10e114 (diff)
[HOTFIX] Fix tokens not generating at eof
-rw-r--r--src/texec/eval.go16
-rw-r--r--src/tparse/tokenize.go2
2 files changed, 11 insertions, 7 deletions
diff --git a/src/texec/eval.go b/src/texec/eval.go
index ead8f74..3eca821 100644
--- a/src/texec/eval.go
+++ b/src/texec/eval.go
@@ -448,14 +448,16 @@ func cata(str TType, skp int, dat []interface{}) {
}
func convertValPS(from, to TType, sk int, dat interface{}) interface{} {
- if isStruct(to, sk) {
- if equateTypePS(from, tStruct, sk) {
- return cvsa(to, sk, )
+ if equateTypePS(from, tStruct, sk) {
+ if isStruct(to, sk) {
+ return cvsa(to, sk)
+ } else if isArray(to, sk) {
+
}
- } else if isArray(to, sk) {
- if equateTypePS(from, tStruct, sk) || isArray(from, sk) {
+ } else if isArray(from, sk) {
+ if isArray(to, sk) {
out := []interface{}
- for i := 0; i < len(dat.([]interface{});i++ {
+ for i := 0; i < len(dat.([]interface{}));i++ {
out = append(out, convertValPS(from, to, sk + 1, dat.([]interface{})[i]))
}
}
@@ -463,7 +465,7 @@ func convertValPS(from, to TType, sk int, dat interface{}) interface{} {
if equateTypePS(to, tInt, sk) {
return dat.(int)
} else if equateTypePS(to, tCharp, sk) {
- return dat.()
+ return dat.(byte)
}
}
diff --git a/src/tparse/tokenize.go b/src/tparse/tokenize.go
index 7f57576..2d49376 100644
--- a/src/tparse/tokenize.go
+++ b/src/tparse/tokenize.go
@@ -235,6 +235,8 @@ func TokenizeFile(path string) []Token {
if err != nil {
if err != io.EOF {
out = append(out, Token{Type: -1})
+ } else {
+ out = append(out, Token{Type: checkToken(b.String(), pre), Data: b.String(), Line: ln, Char: last})
}
break
}