fix: include stdlib sub path bug

joetifa2003 · Apr 5, 2022 · b09b61e · b09b61e
1 parent 5dbc01f
commit b09b61e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -191,12 +191,12 @@ let greeter = fn() {
 
 ```swift
 // main.wind
-include "test.wind";
+include "./test.wind";
 
 greeter(); // Hello 👋
 
 // You can also alias includes
-include "test.wind" as test;
+include "./test.wind" as test;
 
 test.greeter(); // Hello 👋
 ```

diff --git a/evaluator/stdlib.go b/evaluator/stdlib.go
@@ -2,7 +2,7 @@ package evaluator
 
 func GetStdlib(filePath string) (*Environment, bool) {
 	switch filePath {
-	case "stdlib\\strings.go":
+	case "stdlib/strings":
 		return StdlibStrings(), true
 	}
 

diff --git a/parser/parser.go b/parser/parser.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/joetifa2003/windlang/ast"
 	"github.com/joetifa2003/windlang/lexer"
@@ -255,7 +256,11 @@ func (p *Parser) parseIncludeStatement() *ast.IncludeStatement {
 
 	p.nextToken()
 
-	stmt.Path = filepath.Join(filepath.Dir(p.filePath), p.curToken.Literal)
+	if strings.Contains(p.curToken.Literal, "./") || strings.Contains(p.curToken.Literal, "./") {
+		stmt.Path = filepath.Join(filepath.Dir(p.filePath), p.curToken.Literal)
+	} else {
+		stmt.Path = p.curToken.Literal
+	}
 
 	p.nextToken()