A few fixes

+ Fix an error with if statements inside loops
+ Fix a parser bug with boolean operators
~ Change libtnsl stub to return integers when reading a file
~ Change libtnsl stub to return -1 on EOF or file read error

2 files changed, 20 insertions, 5 deletions

diff --git a/src/texec/eval.go b/src/texec/eval.go
index fa187ef..c39d704 100644
--- a/src/texec/eval.go
+++ b/src/texec/eval.go
@@ -994,10 +994,16 @@ func evalValue(v tparse.Node, ctx *VarMap) *TVariable {
 		case "<":
 			out.Type = tBool
 			out.Data = a.Data.(float64) < b.Data.(float64)
-		case ">=":
+		case "!>":
+			out.Type = tBool
+			out.Data = a.Data.(float64) <= b.Data.(float64)
+		case "!<":
 			out.Type = tBool
 			out.Data = a.Data.(float64) >= b.Data.(float64)
-		case "<=":
+		case ">==":
+			out.Type = tBool
+			out.Data = a.Data.(float64) >= b.Data.(float64)
+		case "<==":
 			out.Type = tBool
 			out.Data = a.Data.(float64) <= b.Data.(float64)
 		}
@@ -1081,7 +1087,13 @@ func evalCF(v tparse.Node, ctx *VarMap) (bool, TVariable, int) {
 					if val.Data.(bool) == true {
 						i++
 
-						for ;i < len(v.Sub) && getNames(v.Sub[i])[0] == "else"; i++ {}
+						for ;i < len(v.Sub) && v.Sub[i].Data.Data == "block"; {
+							if getNames(v.Sub[i])[0] == "else" {
+								i++
+							} else {
+								break
+							}
+						}
 						
 						if i < len(v.Sub) {
 							i--
diff --git a/src/texec/libtnsl.go b/src/texec/libtnsl.go
index 581d15e..bb0ce7d 100644
--- a/src/texec/libtnsl.go
+++ b/src/texec/libtnsl.go
@@ -176,8 +176,11 @@ func tfile_close(file TVariable) {
 // tnsl.io.File.read
 func tfile_read(file TVariable) TVariable {
 	b := []byte{1}
-	(file.Data).(*os.File).Read(b)
-	return TVariable{tCharp, b[0]}
+	_, err := (file.Data).(*os.File).Read(b)
+	if err != nil {
+		return TVariable{tInt, -1}
+	}
+	return TVariable{tInt, int(b[0])}
 }
 
 // tnsl.io.File.write