Fixed many errors that occured while having a function within a funct…

…ion, fixed some errors that were in conditional statements and loops
Jamlie · Oct 9, 2023 · 157d336 · 157d336
1 parent ba6d284
commit 157d336
Show file tree

Hide file tree

Showing 12 changed files with 803 additions and 407 deletions.
diff --git a/bin/jamlang.exe b/bin/jamlang.exe
diff --git a/main.go b/main.go
@@ -1,15 +1,15 @@
 package main
 
 import (
-    "fmt"
-    "os"
-    "flag"
-    "strings"
     "bufio"
-    "io/ioutil"
+    "flag"
+    "fmt"
     "io"
+    "io/ioutil"
     "net/http"
-
+    "os"
+    "strings"
+
     "github.com/Jamlee977/CustomLanguage/parser"
     "github.com/Jamlee977/CustomLanguage/runtimelang"
 )
@@ -111,6 +111,30 @@ func main() {
                 }
                 defer file.Close()
 
+                _, err = io.Copy(file, resp.Body)
+                if err != nil {
+                    fmt.Println(err)
+                    os.Exit(0)
+                }
+            } else if args[0] == "random" {
+                resp, err := http.Get("https://raw.githubusercontent.com/Jamlee977/CustomLanguage/main/std/random.jam")
+                if err != nil {
+                    fmt.Println(err)
+                    os.Exit(0)
+                }
+                defer resp.Body.Close()
+
+                if _, err := os.Stat("std"); os.IsNotExist(err) {
+                    os.Mkdir("std", 0755)
+                }
+
+                file, err := os.Create("std/" + args[0] + ".jam")
+                if err != nil {
+                    fmt.Println(err)
+                    os.Exit(0)
+                }
+                defer file.Close()
+
                 _, err = io.Copy(file, resp.Body)
                 if err != nil {
                     fmt.Println(err)
@@ -121,7 +145,7 @@ func main() {
                 os.Exit(0)
             }
         } else {
-             option := args[0]
+            option := args[0]
             if option == "run" {
                 if len(args) < 2 {
                     fmt.Println("No file specified")
@@ -187,6 +211,30 @@ func main() {
                     }
                     defer file.Close()
 
+                    _, err = io.Copy(file, resp.Body)
+                    if err != nil {
+                        fmt.Println(err)
+                        os.Exit(0)
+                    }
+                } else if args[1] == "random" {
+                    resp, err := http.Get("https://raw.githubusercontent.com/Jamlee977/CustomLanguage/main/std/random.jam")
+                    if err != nil {
+                        fmt.Println(err)
+                        os.Exit(0)
+                    }
+                    defer resp.Body.Close()
+
+                    if _, err := os.Stat("std"); os.IsNotExist(err) {
+                        os.Mkdir("std", 0755)
+                    }
+
+                    file, err := os.Create("std/random.jam")
+                    if err != nil {
+                        fmt.Println(err)
+                        os.Exit(0)
+                    }
+                    defer file.Close()
+
                     _, err = io.Copy(file, resp.Body)
                     if err != nil {
                         fmt.Println(err)

diff --git a/parser/parser.go b/parser/parser.go
@@ -246,8 +246,11 @@ func (p *Parser) parseFunctionDeclaration() ast.Statement {
 
     p.expect(tokentype.LSquirly, "Error: Expected '{' after function declaration")
 
-    p.isFunction = true
-    defer func() { p.isFunction = false }()
+    if !p.isFunction {
+        p.isFunction = true
+        defer func() { p.isFunction = false }()
+    }
+
     body := []ast.Statement{}
     for p.at().Type != tokentype.EndOfFile && p.at().Type != tokentype.RSquirly {
         body = append(body, p.parseStatement())