parser module

Merge pull request #13 from wyst-lang/master

.gitignore

@@ -1,38 +1,25 @@
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
-test/
-.vscode/
-.idea/
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# Binaries for programs and plugins
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+*.exe
-Cargo.lock
+*.exe~
+*.dll
+*.so
+*.dylib
 
-# These are backup files generated by rustfmt
+# Test binary, built with `go test -c`
-**/*.rs.bk
+*.test
 
-# MSVC Windows builds of rustc generate these, which store debugging information
+# Output of the go coverage tool, specifically when used with LiteIDE
-*.pdb
+*.out
 
+# Dependency directories (remove the comment below to include it)
+# vendor/
 
-# Added by cargo
+# Go workspace file
-/target
+go.work
 
 # Mac OS
 .DS_Store
 
-#Wyst files for testing
+#vscode
-*.wst
+.vscode
-
-
-# Wyst build output taht contains rust files
-/build
-
-# Wyst compiled output
-out
-
-/log.txt
-/lsp.log
-

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wyst.iml" filepath="$PROJECT_DIR$/.idea/wyst.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.idea/wyst.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="EMPTY_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "rust-analyzer.linkedProjects": [
-        "./Cargo.toml"
-    ],
-    "rust-analyzer.showUnlinkedFileNotification": false,
-    "cSpell.enabled": false
-}

Cargo.toml

@@ -1,20 +0,0 @@
-[package]
-name = "wyst"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-rand = "0.8.5"
-serde_json = "1.0"
-serde = "1.0.203"
-serde_derive = "1.0.203"
-lsp-types = "0.97.0"
-zip = "2.1.3"
-dirs = "5.0.1"
-pest = "2"
-pest_derive = "2.1"
-clap = "3"
-hex =  "0.4"
-regex = "1.10.5"

README.md

@@ -5,7 +5,7 @@
 <h1 align="center">Wyst
 </h1>
 
-<h3 align="center">Wyst is a programing language that has similar syntax to C and transpiles to Rust</h3>
+<h3 align="center">Wyst is a programing language that is inspired by C and transpiles to Go</h3>
 
 ```c
 #include <stdio.h>
@@ -16,5 +16,6 @@ int main() {
 }
 ```
 
-# Alpha
+# For developers
-We are on pure alpha. if you would like to contribute please open a new issue.
+
+If the grammar has been updated run: `antlr -Dlanguage=Go -o parser Wyst.g4`

Wyst.g4

@@ -0,0 +1,28 @@
+grammar Wyst;
+
+WS: [ \t\r\n]+ -> skip;
+NUMBER: [1-9][0-9]* | '0';
+HEX: '0x' [a-fA-F0-9]*;
+IDENTIFIER: [a-zA-Z_] ([a-zA-Z0-9] | '::')*;
+MATH: '+' | '-' | '*' | '/';
+fragment ESC: '\\' ['"\\] ;
+STRING: '"' (ESC | ~["\\])* '"';
+round_def: '(' (var_def (',' var_def)* ','?)? ')';
+func_def: IDENTIFIER IDENTIFIER round_def code_block;
+var_def: IDENTIFIER IDENTIFIER;
+var_def_set: var_def '=' expr;
+asm: '%' IDENTIFIER expr (',' expr)* ';';
+
+expr:
+    (   NUMBER |
+        HEX |
+        IDENTIFIER |
+        STRING
+    ) (MATH expr)*;
+
+code_block: '{' ((
+    expr |
+    var_def |
+    var_def_set
+) ';')* '}';
+top: (asm|func_def)*;

go.mod

@@ -0,0 +1,11 @@
+module github.com/wyst-lang/wyst
+
+go 1.22
+
+toolchain go1.22.6
+
+require github.com/antlr4-go/antlr/v4 v4.13.1 // direct
+
+require (
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+)

go.sum

@@ -0,0 +1,6 @@
+github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522 h1:o+W7GDFUwWtVkN28CW/nhh/aCmHn6OJddUs3+8vMMjs=
+github.com/antlr4-go/antlr v0.0.0-20230518091524-98b52378c522/go.mod h1:srLVvW4JLxy+tCG9Nn2l8al77mUIMCwAOLQocfLDU2w=
+github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
+github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
+golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=

lib/README.md

@@ -1,4 +0,0 @@
-# Wyst stdlib
-
-## > [!NOTE]
-> any changes made here should be documented before pushed to master

lib/stdio.rs

@@ -1,7 +0,0 @@
-#[macro_export]
-
-macro_rules! _0x7072696e7466 {
-    ($($arg:tt)*) => {
-        print!($($arg)*)
-    };
-}

lib/stdlib.rs

@@ -1,23 +0,0 @@
-use std::alloc::{alloc, Layout};
-use std::ptr::null_mut;
-
-// Malloc
-pub fn _0x6d616c6c6f63(size: usize) -> *mut u8 {
-    if size == 0 {
-        return null_mut();
-    }
-
-    // Create a memory layout for the requested size
-    let layout = Layout::from_size_align(size, std::mem::align_of::<u8>()).unwrap();
-
-    // Allocate the memory
-    unsafe {
-        let ptr = alloc(layout);
-        if ptr.is_null() {
-            // Allocation failed
-            null_mut()
-        } else {
-            ptr
-        }
-    }
-}

parser/Wyst.interp

@@ -0,0 +1,47 @@
+token literal names:
+null
+'('
+','
+')'
+'='
+'%'
+';'
+'{'
+'}'
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+WS
+NUMBER
+HEX
+IDENTIFIER
+MATH
+STRING
+
+rule names:
+round_def
+func_def
+var_def
+var_def_set
+asm
+expr
+code_block
+top
+
+
+atn:
+[4, 1, 14, 87, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 21, 8, 0, 10, 0, 12, 0, 24, 9, 0, 1, 0, 3, 0, 27, 8, 0, 3, 0, 29, 8, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 50, 8, 4, 10, 4, 12, 4, 53, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 60, 8, 5, 10, 5, 12, 5, 63, 9, 5, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 69, 8, 6, 1, 6, 1, 6, 5, 6, 73, 8, 6, 10, 6, 12, 6, 76, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 5, 7, 82, 8, 7, 10, 7, 12, 7, 85, 9, 7, 1, 7, 0, 0, 8, 0, 2, 4, 6, 8, 10, 12, 14, 0, 1, 2, 0, 10, 12, 14, 14, 88, 0, 16, 1, 0, 0, 0, 2, 32, 1, 0, 0, 0, 4, 37, 1, 0, 0, 0, 6, 40, 1, 0, 0, 0, 8, 44, 1, 0, 0, 0, 10, 56, 1, 0, 0, 0, 12, 64, 1, 0, 0, 0, 14, 83, 1, 0, 0, 0, 16, 28, 5, 1, 0, 0, 17, 22, 3, 4, 2, 0, 18, 19, 5, 2, 0, 0, 19, 21, 3, 4, 2, 0, 20, 18, 1, 0, 0, 0, 21, 24, 1, 0, 0, 0, 22, 20, 1, 0, 0, 0, 22, 23, 1, 0, 0, 0, 23, 26, 1, 0, 0, 0, 24, 22, 1, 0, 0, 0, 25, 27, 5, 2, 0, 0, 26, 25, 1, 0, 0, 0, 26, 27, 1, 0, 0, 0, 27, 29, 1, 0, 0, 0, 28, 17, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 30, 1, 0, 0, 0, 30, 31, 5, 3, 0, 0, 31, 1, 1, 0, 0, 0, 32, 33, 5, 12, 0, 0, 33, 34, 5, 12, 0, 0, 34, 35, 3, 0, 0, 0, 35, 36, 3, 12, 6, 0, 36, 3, 1, 0, 0, 0, 37, 38, 5, 12, 0, 0, 38, 39, 5, 12, 0, 0, 39, 5, 1, 0, 0, 0, 40, 41, 3, 4, 2, 0, 41, 42, 5, 4, 0, 0, 42, 43, 3, 10, 5, 0, 43, 7, 1, 0, 0, 0, 44, 45, 5, 5, 0, 0, 45, 46, 5, 12, 0, 0, 46, 51, 3, 10, 5, 0, 47, 48, 5, 2, 0, 0, 48, 50, 3, 10, 5, 0, 49, 47, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 54, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 54, 55, 5, 6, 0, 0, 55, 9, 1, 0, 0, 0, 56, 61, 7, 0, 0, 0, 57, 58, 5, 13, 0, 0, 58, 60, 3, 10, 5, 0, 59, 57, 1, 0, 0, 0, 60, 63, 1, 0, 0, 0, 61, 59, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 11, 1, 0, 0, 0, 63, 61, 1, 0, 0, 0, 64, 74, 5, 7, 0, 0, 65, 69, 3, 10, 5, 0, 66, 69, 3, 4, 2, 0, 67, 69, 3, 6, 3, 0, 68, 65, 1, 0, 0, 0, 68, 66, 1, 0, 0, 0, 68, 67, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 5, 6, 0, 0, 71, 73, 1, 0, 0, 0, 72, 68, 1, 0, 0, 0, 73, 76, 1, 0, 0, 0, 74, 72, 1, 0, 0, 0, 74, 75, 1, 0, 0, 0, 75, 77, 1, 0, 0, 0, 76, 74, 1, 0, 0, 0, 77, 78, 5, 8, 0, 0, 78, 13, 1, 0, 0, 0, 79, 82, 3, 8, 4, 0, 80, 82, 3, 2, 1, 0, 81, 79, 1, 0, 0, 0, 81, 80, 1, 0, 0, 0, 82, 85, 1, 0, 0, 0, 83, 81, 1, 0, 0, 0, 83, 84, 1, 0, 0, 0, 84, 15, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 9, 22, 26, 28, 51, 61, 68, 74, 81, 83]

parser/Wyst.tokens

@@ -0,0 +1,22 @@
+T__0=1
+T__1=2
+T__2=3
+T__3=4
+T__4=5
+T__5=6
+T__6=7
+T__7=8
+WS=9
+NUMBER=10
+HEX=11
+IDENTIFIER=12
+MATH=13
+STRING=14
+'('=1
+','=2
+')'=3
+'='=4
+'%'=5
+';'=6
+'{'=7
+'}'=8

parser/WystLexer.interp

@@ -0,0 +1,60 @@
+token literal names:
+null
+'('
+','
+')'
+'='
+'%'
+';'
+'{'
+'}'
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+WS
+NUMBER
+HEX
+IDENTIFIER
+MATH
+STRING
+
+rule names:
+T__0
+T__1
+T__2
+T__3
+T__4
+T__5
+T__6
+T__7
+WS
+NUMBER
+HEX
+IDENTIFIER
+MATH
+ESC
+STRING
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+
+mode names:
+DEFAULT_MODE
+
+atn:
+[4, 0, 14, 97, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 4, 8, 49, 8, 8, 11, 8, 12, 8, 50, 1, 8, 1, 8, 1, 9, 1, 9, 5, 9, 57, 8, 9, 10, 9, 12, 9, 60, 9, 9, 1, 9, 3, 9, 63, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 69, 8, 10, 10, 10, 12, 10, 72, 9, 10, 1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 78, 8, 11, 10, 11, 12, 11, 81, 9, 11, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 5, 14, 91, 8, 14, 10, 14, 12, 14, 94, 9, 14, 1, 14, 1, 14, 0, 0, 15, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 0, 29, 14, 1, 0, 9, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 49, 57, 1, 0, 48, 57, 3, 0, 48, 57, 65, 70, 97, 102, 3, 0, 65, 90, 95, 95, 97, 122, 3, 0, 48, 57, 65, 90, 97, 122, 3, 0, 42, 43, 45, 45, 47, 47, 3, 0, 34, 34, 39, 39, 92, 92, 2, 0, 34, 34, 92, 92, 103, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 1, 31, 1, 0, 0, 0, 3, 33, 1, 0, 0, 0, 5, 35, 1, 0, 0, 0, 7, 37, 1, 0, 0, 0, 9, 39, 1, 0, 0, 0, 11, 41, 1, 0, 0, 0, 13, 43, 1, 0, 0, 0, 15, 45, 1, 0, 0, 0, 17, 48, 1, 0, 0, 0, 19, 62, 1, 0, 0, 0, 21, 64, 1, 0, 0, 0, 23, 73, 1, 0, 0, 0, 25, 82, 1, 0, 0, 0, 27, 84, 1, 0, 0, 0, 29, 87, 1, 0, 0, 0, 31, 32, 5, 40, 0, 0, 32, 2, 1, 0, 0, 0, 33, 34, 5, 44, 0, 0, 34, 4, 1, 0, 0, 0, 35, 36, 5, 41, 0, 0, 36, 6, 1, 0, 0, 0, 37, 38, 5, 61, 0, 0, 38, 8, 1, 0, 0, 0, 39, 40, 5, 37, 0, 0, 40, 10, 1, 0, 0, 0, 41, 42, 5, 59, 0, 0, 42, 12, 1, 0, 0, 0, 43, 44, 5, 123, 0, 0, 44, 14, 1, 0, 0, 0, 45, 46, 5, 125, 0, 0, 46, 16, 1, 0, 0, 0, 47, 49, 7, 0, 0, 0, 48, 47, 1, 0, 0, 0, 49, 50, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 53, 6, 8, 0, 0, 53, 18, 1, 0, 0, 0, 54, 58, 7, 1, 0, 0, 55, 57, 7, 2, 0, 0, 56, 55, 1, 0, 0, 0, 57, 60, 1, 0, 0, 0, 58, 56, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 63, 1, 0, 0, 0, 60, 58, 1, 0, 0, 0, 61, 63, 5, 48, 0, 0, 62, 54, 1, 0, 0, 0, 62, 61, 1, 0, 0, 0, 63, 20, 1, 0, 0, 0, 64, 65, 5, 48, 0, 0, 65, 66, 5, 120, 0, 0, 66, 70, 1, 0, 0, 0, 67, 69, 7, 3, 0, 0, 68, 67, 1, 0, 0, 0, 69, 72, 1, 0, 0, 0, 70, 68, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 22, 1, 0, 0, 0, 72, 70, 1, 0, 0, 0, 73, 79, 7, 4, 0, 0, 74, 78, 7, 5, 0, 0, 75, 76, 5, 58, 0, 0, 76, 78, 5, 58, 0, 0, 77, 74, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 81, 1, 0, 0, 0, 79, 77, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 24, 1, 0, 0, 0, 81, 79, 1, 0, 0, 0, 82, 83, 7, 6, 0, 0, 83, 26, 1, 0, 0, 0, 84, 85, 5, 92, 0, 0, 85, 86, 7, 7, 0, 0, 86, 28, 1, 0, 0, 0, 87, 92, 5, 34, 0, 0, 88, 91, 3, 27, 13, 0, 89, 91, 8, 8, 0, 0, 90, 88, 1, 0, 0, 0, 90, 89, 1, 0, 0, 0, 91, 94, 1, 0, 0, 0, 92, 90, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 95, 1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 95, 96, 5, 34, 0, 0, 96, 30, 1, 0, 0, 0, 9, 0, 50, 58, 62, 70, 77, 79, 90, 92, 1, 6, 0, 0]

parser/WystLexer.tokens

@@ -0,0 +1,22 @@
+T__0=1
+T__1=2
+T__2=3
+T__3=4
+T__4=5
+T__5=6
+T__6=7
+T__7=8
+WS=9
+NUMBER=10
+HEX=11
+IDENTIFIER=12
+MATH=13
+STRING=14
+'('=1
+','=2
+')'=3
+'='=4
+'%'=5
+';'=6
+'{'=7
+'}'=8

parser/wyst_base_listener.go

@@ -0,0 +1,70 @@
+// Code generated from Wyst.g4 by ANTLR 4.13.2. DO NOT EDIT.
+
+package parser // Wyst
+
+import "github.com/antlr4-go/antlr/v4"
+
+// BaseWystListener is a complete listener for a parse tree produced by WystParser.
+type BaseWystListener struct{}
+
+var _ WystListener = &BaseWystListener{}
+
+// VisitTerminal is called when a terminal node is visited.
+func (s *BaseWystListener) VisitTerminal(node antlr.TerminalNode) {}
+
+// VisitErrorNode is called when an error node is visited.
+func (s *BaseWystListener) VisitErrorNode(node antlr.ErrorNode) {}
+
+// EnterEveryRule is called when any rule is entered.
+func (s *BaseWystListener) EnterEveryRule(ctx antlr.ParserRuleContext) {}
+
+// ExitEveryRule is called when any rule is exited.
+func (s *BaseWystListener) ExitEveryRule(ctx antlr.ParserRuleContext) {}
+
+// EnterRound_def is called when production round_def is entered.
+func (s *BaseWystListener) EnterRound_def(ctx *Round_defContext) {}
+
+// ExitRound_def is called when production round_def is exited.
+func (s *BaseWystListener) ExitRound_def(ctx *Round_defContext) {}
+
+// EnterFunc_def is called when production func_def is entered.
+func (s *BaseWystListener) EnterFunc_def(ctx *Func_defContext) {}
+
+// ExitFunc_def is called when production func_def is exited.
+func (s *BaseWystListener) ExitFunc_def(ctx *Func_defContext) {}
+
+// EnterVar_def is called when production var_def is entered.
+func (s *BaseWystListener) EnterVar_def(ctx *Var_defContext) {}
+
+// ExitVar_def is called when production var_def is exited.
+func (s *BaseWystListener) ExitVar_def(ctx *Var_defContext) {}
+
+// EnterVar_def_set is called when production var_def_set is entered.
+func (s *BaseWystListener) EnterVar_def_set(ctx *Var_def_setContext) {}
+
+// ExitVar_def_set is called when production var_def_set is exited.
+func (s *BaseWystListener) ExitVar_def_set(ctx *Var_def_setContext) {}
+
+// EnterAsm is called when production asm is entered.
+func (s *BaseWystListener) EnterAsm(ctx *AsmContext) {}
+
+// ExitAsm is called when production asm is exited.
+func (s *BaseWystListener) ExitAsm(ctx *AsmContext) {}
+
+// EnterExpr is called when production expr is entered.
+func (s *BaseWystListener) EnterExpr(ctx *ExprContext) {}
+
+// ExitExpr is called when production expr is exited.
+func (s *BaseWystListener) ExitExpr(ctx *ExprContext) {}
+
+// EnterCode_block is called when production code_block is entered.
+func (s *BaseWystListener) EnterCode_block(ctx *Code_blockContext) {}
+
+// ExitCode_block is called when production code_block is exited.
+func (s *BaseWystListener) ExitCode_block(ctx *Code_blockContext) {}
+
+// EnterTop is called when production top is entered.
+func (s *BaseWystListener) EnterTop(ctx *TopContext) {}
+
+// ExitTop is called when production top is exited.
+func (s *BaseWystListener) ExitTop(ctx *TopContext) {}

parser/wyst_lexer.go

@@ -0,0 +1,156 @@
+// Code generated from Wyst.g4 by ANTLR 4.13.2. DO NOT EDIT.
+
+package parser
+
+import (
+	"fmt"
+	"github.com/antlr4-go/antlr/v4"
+	"sync"
+	"unicode"
+)
+
+// Suppress unused import error
+var _ = fmt.Printf
+var _ = sync.Once{}
+var _ = unicode.IsLetter
+
+type WystLexer struct {
+	*antlr.BaseLexer
+	channelNames []string
+	modeNames    []string
+	// TODO: EOF string
+}
+
+var WystLexerLexerStaticData struct {
+	once                   sync.Once
+	serializedATN          []int32
+	ChannelNames           []string
+	ModeNames              []string
+	LiteralNames           []string
+	SymbolicNames          []string
+	RuleNames              []string
+	PredictionContextCache *antlr.PredictionContextCache
+	atn                    *antlr.ATN
+	decisionToDFA          []*antlr.DFA
+}
+
+func wystlexerLexerInit() {
+	staticData := &WystLexerLexerStaticData
+	staticData.ChannelNames = []string{
+		"DEFAULT_TOKEN_CHANNEL", "HIDDEN",
+	}
+	staticData.ModeNames = []string{
+		"DEFAULT_MODE",
+	}
+	staticData.LiteralNames = []string{
+		"", "'('", "','", "')'", "'='", "'%'", "';'", "'{'", "'}'",
+	}
+	staticData.SymbolicNames = []string{
+		"", "", "", "", "", "", "", "", "", "WS", "NUMBER", "HEX", "IDENTIFIER",
+		"MATH", "STRING",
+	}
+	staticData.RuleNames = []string{
+		"T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "WS",
+		"NUMBER", "HEX", "IDENTIFIER", "MATH", "ESC", "STRING",
+	}
+	staticData.PredictionContextCache = antlr.NewPredictionContextCache()
+	staticData.serializedATN = []int32{
+		4, 0, 14, 97, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2,
+		4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2,
+		10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0,
+		1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6,
+		1, 6, 1, 7, 1, 7, 1, 8, 4, 8, 49, 8, 8, 11, 8, 12, 8, 50, 1, 8, 1, 8, 1,
+		9, 1, 9, 5, 9, 57, 8, 9, 10, 9, 12, 9, 60, 9, 9, 1, 9, 3, 9, 63, 8, 9,
+		1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 69, 8, 10, 10, 10, 12, 10, 72, 9, 10,
+		1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 78, 8, 11, 10, 11, 12, 11, 81, 9, 11,
+		1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 5, 14, 91, 8, 14,
+		10, 14, 12, 14, 94, 9, 14, 1, 14, 1, 14, 0, 0, 15, 1, 1, 3, 2, 5, 3, 7,
+		4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27,
+		0, 29, 14, 1, 0, 9, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 49, 57, 1, 0, 48,
+		57, 3, 0, 48, 57, 65, 70, 97, 102, 3, 0, 65, 90, 95, 95, 97, 122, 3, 0,
+		48, 57, 65, 90, 97, 122, 3, 0, 42, 43, 45, 45, 47, 47, 3, 0, 34, 34, 39,
+		39, 92, 92, 2, 0, 34, 34, 92, 92, 103, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0,
+		0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0,
+		0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0,
+		0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 29, 1,
+		0, 0, 0, 1, 31, 1, 0, 0, 0, 3, 33, 1, 0, 0, 0, 5, 35, 1, 0, 0, 0, 7, 37,
+		1, 0, 0, 0, 9, 39, 1, 0, 0, 0, 11, 41, 1, 0, 0, 0, 13, 43, 1, 0, 0, 0,
+		15, 45, 1, 0, 0, 0, 17, 48, 1, 0, 0, 0, 19, 62, 1, 0, 0, 0, 21, 64, 1,
+		0, 0, 0, 23, 73, 1, 0, 0, 0, 25, 82, 1, 0, 0, 0, 27, 84, 1, 0, 0, 0, 29,
+		87, 1, 0, 0, 0, 31, 32, 5, 40, 0, 0, 32, 2, 1, 0, 0, 0, 33, 34, 5, 44,
+		0, 0, 34, 4, 1, 0, 0, 0, 35, 36, 5, 41, 0, 0, 36, 6, 1, 0, 0, 0, 37, 38,
+		5, 61, 0, 0, 38, 8, 1, 0, 0, 0, 39, 40, 5, 37, 0, 0, 40, 10, 1, 0, 0, 0,
+		41, 42, 5, 59, 0, 0, 42, 12, 1, 0, 0, 0, 43, 44, 5, 123, 0, 0, 44, 14,
+		1, 0, 0, 0, 45, 46, 5, 125, 0, 0, 46, 16, 1, 0, 0, 0, 47, 49, 7, 0, 0,
+		0, 48, 47, 1, 0, 0, 0, 49, 50, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51,
+		1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 52, 53, 6, 8, 0, 0, 53, 18, 1, 0, 0, 0,
+		54, 58, 7, 1, 0, 0, 55, 57, 7, 2, 0, 0, 56, 55, 1, 0, 0, 0, 57, 60, 1,
+		0, 0, 0, 58, 56, 1, 0, 0, 0, 58, 59, 1, 0, 0, 0, 59, 63, 1, 0, 0, 0, 60,
+		58, 1, 0, 0, 0, 61, 63, 5, 48, 0, 0, 62, 54, 1, 0, 0, 0, 62, 61, 1, 0,
+		0, 0, 63, 20, 1, 0, 0, 0, 64, 65, 5, 48, 0, 0, 65, 66, 5, 120, 0, 0, 66,
+		70, 1, 0, 0, 0, 67, 69, 7, 3, 0, 0, 68, 67, 1, 0, 0, 0, 69, 72, 1, 0, 0,
+		0, 70, 68, 1, 0, 0, 0, 70, 71, 1, 0, 0, 0, 71, 22, 1, 0, 0, 0, 72, 70,
+		1, 0, 0, 0, 73, 79, 7, 4, 0, 0, 74, 78, 7, 5, 0, 0, 75, 76, 5, 58, 0, 0,
+		76, 78, 5, 58, 0, 0, 77, 74, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 81, 1,
+		0, 0, 0, 79, 77, 1, 0, 0, 0, 79, 80, 1, 0, 0, 0, 80, 24, 1, 0, 0, 0, 81,
+		79, 1, 0, 0, 0, 82, 83, 7, 6, 0, 0, 83, 26, 1, 0, 0, 0, 84, 85, 5, 92,
+		0, 0, 85, 86, 7, 7, 0, 0, 86, 28, 1, 0, 0, 0, 87, 92, 5, 34, 0, 0, 88,
+		91, 3, 27, 13, 0, 89, 91, 8, 8, 0, 0, 90, 88, 1, 0, 0, 0, 90, 89, 1, 0,
+		0, 0, 91, 94, 1, 0, 0, 0, 92, 90, 1, 0, 0, 0, 92, 93, 1, 0, 0, 0, 93, 95,
+		1, 0, 0, 0, 94, 92, 1, 0, 0, 0, 95, 96, 5, 34, 0, 0, 96, 30, 1, 0, 0, 0,
+		9, 0, 50, 58, 62, 70, 77, 79, 90, 92, 1, 6, 0, 0,
+	}
+	deserializer := antlr.NewATNDeserializer(nil)
+	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
+	atn := staticData.atn
+	staticData.decisionToDFA = make([]*antlr.DFA, len(atn.DecisionToState))
+	decisionToDFA := staticData.decisionToDFA
+	for index, state := range atn.DecisionToState {
+		decisionToDFA[index] = antlr.NewDFA(state, index)
+	}
+}
+
+// WystLexerInit initializes any static state used to implement WystLexer. By default the
+// static state used to implement the lexer is lazily initialized during the first call to
+// NewWystLexer(). You can call this function if you wish to initialize the static state ahead
+// of time.
+func WystLexerInit() {
+	staticData := &WystLexerLexerStaticData
+	staticData.once.Do(wystlexerLexerInit)
+}
+
+// NewWystLexer produces a new lexer instance for the optional input antlr.CharStream.
+func NewWystLexer(input antlr.CharStream) *WystLexer {
+	WystLexerInit()
+	l := new(WystLexer)
+	l.BaseLexer = antlr.NewBaseLexer(input)
+	staticData := &WystLexerLexerStaticData
+	l.Interpreter = antlr.NewLexerATNSimulator(l, staticData.atn, staticData.decisionToDFA, staticData.PredictionContextCache)
+	l.channelNames = staticData.ChannelNames
+	l.modeNames = staticData.ModeNames
+	l.RuleNames = staticData.RuleNames
+	l.LiteralNames = staticData.LiteralNames
+	l.SymbolicNames = staticData.SymbolicNames
+	l.GrammarFileName = "Wyst.g4"
+	// TODO: l.EOF = antlr.TokenEOF
+
+	return l
+}
+
+// WystLexer tokens.
+const (
+	WystLexerT__0       = 1
+	WystLexerT__1       = 2
+	WystLexerT__2       = 3
+	WystLexerT__3       = 4
+	WystLexerT__4       = 5
+	WystLexerT__5       = 6
+	WystLexerT__6       = 7
+	WystLexerT__7       = 8
+	WystLexerWS         = 9
+	WystLexerNUMBER     = 10
+	WystLexerHEX        = 11
+	WystLexerIDENTIFIER = 12
+	WystLexerMATH       = 13
+	WystLexerSTRING     = 14
+)

parser/wyst_listener.go

@@ -0,0 +1,58 @@
+// Code generated from Wyst.g4 by ANTLR 4.13.2. DO NOT EDIT.
+
+package parser // Wyst
+
+import "github.com/antlr4-go/antlr/v4"
+
+// WystListener is a complete listener for a parse tree produced by WystParser.
+type WystListener interface {
+	antlr.ParseTreeListener
+
+	// EnterRound_def is called when entering the round_def production.
+	EnterRound_def(c *Round_defContext)
+
+	// EnterFunc_def is called when entering the func_def production.
+	EnterFunc_def(c *Func_defContext)
+
+	// EnterVar_def is called when entering the var_def production.
+	EnterVar_def(c *Var_defContext)
+
+	// EnterVar_def_set is called when entering the var_def_set production.
+	EnterVar_def_set(c *Var_def_setContext)
+
+	// EnterAsm is called when entering the asm production.
+	EnterAsm(c *AsmContext)
+
+	// EnterExpr is called when entering the expr production.
+	EnterExpr(c *ExprContext)
+
+	// EnterCode_block is called when entering the code_block production.
+	EnterCode_block(c *Code_blockContext)
+
+	// EnterTop is called when entering the top production.
+	EnterTop(c *TopContext)
+
+	// ExitRound_def is called when exiting the round_def production.
+	ExitRound_def(c *Round_defContext)
+
+	// ExitFunc_def is called when exiting the func_def production.
+	ExitFunc_def(c *Func_defContext)
+
+	// ExitVar_def is called when exiting the var_def production.
+	ExitVar_def(c *Var_defContext)
+
+	// ExitVar_def_set is called when exiting the var_def_set production.
+	ExitVar_def_set(c *Var_def_setContext)
+
+	// ExitAsm is called when exiting the asm production.
+	ExitAsm(c *AsmContext)
+
+	// ExitExpr is called when exiting the expr production.
+	ExitExpr(c *ExprContext)
+
+	// ExitCode_block is called when exiting the code_block production.
+	ExitCode_block(c *Code_blockContext)
+
+	// ExitTop is called when exiting the top production.
+	ExitTop(c *TopContext)
+}

src/compiler.rs

@@ -1,90 +0,0 @@
-use std::str;
-use std::{fs, path::Path, process::Command};
-
-use crate::{
-    transpiler::{State, Transpiler},
-    utils::{Problem, ProblemCap, ProblemType},
-};
-
-pub fn transpile_file(input_file: String, output_file: String, is_main: bool) -> u8 {
-    let mut ecode: u8 = 0;
-    let mut trsp = Transpiler {
-        ..Default::default()
-    };
-    if let Ok(file_contents) = fs::read_to_string(input_file) {
-        let mut module_code = String::new();
-        let mut output_code = String::new();
-        match trsp.transpile_code(file_contents, 0) {
-            Ok(rcode) => output_code += rcode.as_str(),
-            Err(e) => {
-                ecode = 1;
-                println!("{e}")
-            }
-        }
-        if is_main {
-            for module in trsp.clone().mod_manager.modules {
-                module_code += "mod ";
-                module_code += module.rs_mod.as_str();
-                module_code += ";\n";
-            }
-        }
-        output_code = format!(
-            "{module_code}\n{output_code}\nfn main() {}{}{}",
-            "{_0x",
-            hex::encode("main"),
-            "();}"
-        );
-        if let Ok(_) = fs::write(Path::new("build").join(output_file), output_code) {
-            trsp.problems.append(&mut trsp.mod_manager.write());
-        }
-    } else {
-        trsp.problems.push(ProblemCap::Error(Problem {
-            problem_msg: "File not found".to_string(),
-            problem_type: ProblemType::FileNotFound,
-            state: State {
-                line: 0,
-                column: 0,
-                file: None,
-            },
-        }))
-    }
-    for p in trsp.problems {
-        match p {
-            ProblemCap::Error(problem) => {
-                ecode = 1;
-                if problem.state.file == None {
-                    println!(
-                        "\x1b[31;1m{:?}\x1b[0;1m: {}",
-                        problem.problem_type, problem.problem_msg,
-                    )
-                } else {
-                    println!(
-                        "\x1b[31;1mError\x1b[0;1m: {}\x1b[0m\n{}:{}: {:?}",
-                        problem.problem_msg,
-                        problem.state.line,
-                        problem.state.column,
-                        problem.problem_type,
-                    )
-                }
-            }
-        }
-    }
-    ecode
-}
-
-pub fn compile_rust(exe_file: String) {
-    let output = Command::new("rustc")
-        .arg(Path::new("build").join("main.rs"))
-        .arg("-o")
-        .arg(exe_file.clone())
-        .output()
-        .expect("Error compiling rust: ");
-    if &output.stderr.len() == &0 {
-        println!("Compiled successfully: \x1b[34;4m{}", exe_file.clone());
-    } else {
-        println!(
-            "{}",
-            str::from_utf8(&output.stderr).expect("Error encoding stderr")
-        );
-    }
-}

src/main.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func main() {
+	content, err := os.ReadFile("test/main.wst")
+	if err != nil {
+		fmt.Println("Error reading file:", err)
+		return
+	}
+	code := Transpile(string(content))
+	fmt.Printf("output:\n%s\n", code)
+}

src/main.rs

@@ -1,88 +0,0 @@
-use std::str;
-use std::thread::sleep;
-use std::time::Duration;
-use std::{fs, io::Read, process};
-mod compiler;
-mod transpiler;
-mod utils;
-
-use clap::{App, Arg};
-use compiler::{compile_rust, transpile_file};
-use utils::match_code;
-
-fn main() {
-    let matches = App::new("Wyst")
-        .version("0.51")
-        .author("Orus")
-        .about("The wyst compiler")
-        .arg(
-            Arg::with_name("file")
-                .required_unless_one(&["stdio", "hex", "logo"])
-                .help("Sets the input file to use"),
-        )
-        .arg(
-            Arg::with_name("output")
-                .short('o')
-                .long("output")
-                .takes_value(true)
-                .help("Specifies the output binary file name"),
-        )
-        .arg(
-            Arg::with_name("build")
-                .short('b')
-                .long("build")
-                .help("Puts the rust files in the build directory"),
-        )
-        .arg(
-            Arg::with_name("stdio")
-                .short('s')
-                .long("stdio")
-                .help("LSP Mode"),
-        )
-        .arg(
-            Arg::with_name("hex")
-                .short('h')
-                .long("hex")
-                .takes_value(true)
-                .help("Turn an identifier into hex"),
-        )
-        .arg(Arg::with_name("logo").long("logo").hide(true))
-        .get_matches();
-    if matches.is_present("logo") {
-        println!("{}", utils::LOGO);
-        let mut byte = [4; 4];
-        std::io::stdin().read_exact(&mut byte).unwrap();
-        let egg = str::from_utf8(&byte).unwrap().to_string();
-        let mut counter: u8 = 30;
-        if egg == "logo" {
-            loop {
-                if counter == 35 {
-                    counter = 30;
-                }
-                println!("\x1B[2J\x1B[{}m{}", counter, utils::LOGO);
-                sleep(Duration::from_millis(400));
-                counter += 1;
-            }
-        }
-    } else if matches.is_present("stdio") {
-        println!(
-            "{:?}",
-            match_code("void testme(int x) {}\ntest".to_string(), 1, 3).unwrap()
-        );
-    } else if matches.is_present("hex") {
-        let ident = matches.value_of("hex").unwrap().to_string();
-        println!("_0x{}", hex::encode(ident));
-    } else {
-        let file = matches.value_of("file").unwrap().to_string();
-        let output = matches.value_of("output").unwrap_or("out").to_string();
-        if let Ok(_) = fs::create_dir("build") {}
-        let ecode = transpile_file(file, "main.rs".to_string(), true);
-        if ecode == 0 {
-            compile_rust(output);
-        }
-        if !matches.is_present("build") {
-            fs::remove_dir_all("build").expect("Error removing build");
-        }
-        process::exit(ecode as i32);
-    }
-}

src/parser.go

@@ -0,0 +1,56 @@
+package main
+
+import (
+	"github.com/antlr4-go/antlr/v4"
+	"github.com/wyst-lang/wyst/parser"
+)
+
+type ASTNode struct {
+	Rule  string
+	Text  string
+	Inner []ASTNode
+}
+
+func getTokenName(tokenType int, lexer *parser.WystLexer) string {
+	if tokenType >= 0 && tokenType < len(lexer.SymbolicNames) {
+		if lexer.SymbolicNames[tokenType] != "" {
+			return lexer.SymbolicNames[tokenType]
+		}
+		return lexer.LiteralNames[tokenType]
+	}
+	return "UNKNOWN"
+}
+
+func ConvertAST(node antlr.Tree, wparser *parser.WystParser, lexer *parser.WystLexer) ASTNode {
+	var ast = ASTNode{}
+	switch node := node.(type) {
+	case antlr.TerminalNode:
+		token := node.GetSymbol()
+		ast.Text = token.GetText()
+		ast.Rule = getTokenName(token.GetTokenType(), lexer)
+	default:
+		if ruleContext, ok := node.(antlr.RuleContext); ok {
+			ast.Rule = wparser.RuleNames[ruleContext.GetRuleIndex()]
+		}
+		if parseTree, ok := node.(antlr.ParseTree); ok {
+			ast.Text = parseTree.GetText()
+		}
+		for i := 0; i < node.GetChildCount(); i++ {
+			l := ConvertAST(node.GetChild(i), wparser, lexer)
+			if l.Rule != ("'"+l.Text+"'") || l.Text == ";" {
+				ast.Inner = append(ast.Inner, l)
+			}
+		}
+	}
+	return ast
+}
+
+func Parse(code string) ASTNode {
+	chars := antlr.NewInputStream(code)
+	lexer := parser.NewWystLexer(chars)
+	stream := antlr.NewCommonTokenStream(lexer, 0)
+	p := parser.NewWystParser(stream)
+	// p.AddErrorListener(antlr.NewDiagnosticErrorListener(true).WithContext(p))
+	tree := p.Top()
+	return ConvertAST(tree, p, lexer)
+}

src/transpiler.go

@@ -0,0 +1,93 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+)
+
+type wmap [2]string
+
+var wyst_map []wmap
+
+func TranspileToken(node ASTNode) string {
+	res := ""
+	switch node.Rule {
+
+	case "NUMBER":
+		res += node.Text
+	case "IDENTIFIER":
+		for _, i := range wyst_map {
+			if node.Text == i[0] {
+				return i[1]
+			}
+		}
+		res += "_0x"
+		for _, c := range node.Text {
+			if c == ':' || c == '.' {
+				res += string(c)
+			} else {
+				res += fmt.Sprintf("%x", c)
+			}
+		}
+	case "HEX":
+		res += node.Text
+	case "MATH":
+		res += node.Text
+	case "STRING":
+		res += node.Text
+	case "';'":
+		res += "\n  "
+	default:
+		fmt.Printf("\x1b[33mDEV NOTICE:\x1b[0m Missing token case for '%s'\n", node.Rule)
+
+	}
+
+	return res
+}
+
+func TranspileNode(node ASTNode) string {
+	res := ""
+	if node.Rule == strings.ToUpper(node.Rule) {
+		return TranspileToken(node)
+	}
+	switch node.Rule {
+
+	case "func_def":
+		res += fmt.Sprintf("func %s%s %s %s", TranspileNode(node.Inner[1]), TranspileNode(node.Inner[2]), TranspileNode(node.Inner[0]), TranspileNode(node.Inner[3]))
+	case "expr":
+		res += TranspileNodes(node.Inner)
+	case "code_block":
+		res += "{\n  "
+		res += strings.TrimSuffix(TranspileNodes(node.Inner), " ")
+		res += "}\n"
+	case "var_def":
+		res += fmt.Sprintf("var %s %s", TranspileNode(node.Inner[1]), TranspileNode(node.Inner[0]))
+	case "round_def":
+		res += "("
+		res += strings.TrimSuffix(strings.ReplaceAll(TranspileNodes(node.Inner), "var ", ""), " ")
+		res += ")"
+	case "asm":
+		if node.Inner[0].Text == "map" && len(node.Inner) == 4 {
+			wyst_map = append(wyst_map, wmap{node.Inner[1].Text, node.Inner[2].Text})
+		}
+
+	default:
+		fmt.Printf("\x1b[33mDEV NOTICE:\x1b[0m Missing case for '%s'\n", node.Rule)
+
+	}
+	return res
+}
+
+func TranspileNodes(nodes []ASTNode) string {
+	res := ""
+	for i := 0; i < len(nodes); i++ {
+		res += TranspileNode(nodes[i])
+	}
+	return res
+}
+
+func Transpile(code string) string {
+	ast := Parse(code)
+	res := TranspileNodes(ast.Inner)
+	return res
+}

src/transpiler.rs

@@ -1,436 +0,0 @@
-use crate::utils::{ModManager, ProblemCap};
-use pest::iterators::{Pair, Pairs};
-use serde::{Deserialize, Serialize};
-
-// The Parser
-use pest::{error::Error, Parser};
-use pest_derive::Parser;
-#[derive(Parser)]
-#[grammar = "wyst.pest"]
-pub struct WystParser;
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-pub struct State {
-    pub line: u32,
-    pub column: u32,
-    pub file: Option<String>,
-}
-
-#[derive(Debug, Clone)]
-#[allow(dead_code)]
-pub struct Transpiler {
-    pub problems: Vec<ProblemCap>,
-    pub state: State,
-    pub inject: Inject,
-    pub mod_manager: ModManager,
-}
-#[derive(Debug, Clone)]
-#[allow(dead_code)]
-pub struct Inject {
-    pub state: State,
-    pub inject: bool,
-}
-
-impl Default for Inject {
-    fn default() -> Self {
-        Inject {
-            inject: false,
-            state: State {
-                line: 0,
-                column: 0,
-                file: None,
-            },
-        }
-    }
-}
-
-impl Default for Transpiler {
-    fn default() -> Self {
-        Transpiler {
-            inject: Inject::default(),
-            problems: Vec::new(),
-            mod_manager: ModManager::new(),
-            state: State {
-                line: 1,
-                column: 0,
-                file: None,
-            },
-        }
-    }
-}
-
-pub fn to_indexable(pairs: Pairs<Rule>) -> Vec<Pair<Rule>> {
-    let mut arr: Vec<Pair<Rule>> = Vec::new();
-    for pair in pairs {
-        arr.push(pair)
-    }
-    arr
-}
-
-impl Transpiler {
-    pub fn encode_ident(&mut self, ident: &str) -> String {
-        match WystParser::parse(Rule::def_identifier, ident) {
-            Ok(parsed) => {
-                let mut output = String::new();
-                for pair in parsed {
-                    let tokens = to_indexable(pair.clone().into_inner());
-                    for t in tokens {
-                        match t.as_rule() {
-                            Rule::identifier => {
-                                let ident = t.as_str().trim();
-                                let mut ident_rs = String::from("_0x");
-                                let ident_chars: Vec<char> = ident.chars().collect();
-                                for i in 0..ident_chars.len() {
-                                    let current = ident_chars[i];
-                                    if ident_chars.len() > i + 1 {
-                                        let next = ident_chars[i + 1];
-                                        if current == '.' {
-                                            ident_rs += "._0x";
-                                        } else if current == ':' && next == ':' {
-                                            ident_rs += "::_0x";
-                                        } else {
-                                            if current != ':' && current != '.' {
-                                                ident_rs +=
-                                                    hex::encode(current.to_string()).as_str();
-                                            }
-                                        }
-                                    } else {
-                                        if current == '.' {
-                                            ident_rs += "._0x";
-                                        } else {
-                                            ident_rs += hex::encode(current.to_string()).as_str();
-                                        }
-                                    }
-                                }
-                                if self.mod_manager.macros.contains(&ident_rs) {
-                                    output += ident_rs.as_str();
-                                    output += "!";
-                                } else {
-                                    output += match ident {
-                                        "void" => "()",
-                                        "int" => "i32",
-                                        "float" => "f64",
-                                        "Vec" => "Vec",
-                                        "bool" => "bool",
-                                        _ => {
-                                            if self.mod_manager.map.contains_key(ident) {
-                                                self.mod_manager.map.get(ident).unwrap()
-                                            } else {
-                                                ident_rs.as_str()
-                                            }
-                                        }
-                                    };
-                                }
-                            }
-                            Rule::def_identifier => {
-                                output += "<";
-                                output += self.encode_ident(t.as_str()).as_str();
-                                output += ">";
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-                output
-            }
-            Err(_) => String::new(),
-        }
-    }
-    pub fn transpile_pairs(&mut self, pairs: Pairs<Rule>) -> String {
-        let mut res = String::new();
-        for pair in pairs {
-            res += self.transpile(pair).as_str();
-        }
-        res
-    }
-    pub fn transpile_vec(&mut self, pairs: Vec<Pair<Rule>>) -> String {
-        let mut res = String::new();
-        for pair in pairs {
-            res += self.transpile(pair).as_str();
-        }
-        res
-    }
-    pub fn transpile(&mut self, pair: Pair<Rule>) -> String {
-        let mut res = String::new();
-        let tokens = to_indexable(pair.clone().into_inner());
-        match pair.as_rule() {
-            Rule::func_def => {
-                res += format!(
-                    "pub fn {}({}) -> {} {}\n",
-                    self.transpile(tokens[1].clone()),
-                    self.transpile_pairs(tokens[2].clone().into_inner())
-                        .as_str()
-                        .replace("let mut", ""),
-                    self.transpile(tokens[0].clone()),
-                    self.transpile(tokens[3].clone())
-                )
-                .as_str();
-            }
-            Rule::ptr_fn_def => {
-                res += format!(
-                    "pub fn {}({}) -> &mut {} {}\n",
-                    self.transpile(tokens[1].clone()),
-                    self.transpile_pairs(tokens[2].clone().into_inner())
-                        .as_str()
-                        .replace("let mut", ""),
-                    self.transpile(tokens[0].clone()),
-                    self.transpile(tokens[3].clone())
-                )
-                .as_str();
-            }
-            Rule::var_def_ptr => {
-                res += format!(
-                    "let mut {}: &mut {}",
-                    self.transpile(tokens[1].clone()),
-                    self.transpile(tokens[0].clone())
-                )
-                .as_str();
-            }
-            Rule::var_def => {
-                if tokens.len() == 1 {
-                    res += self.transpile(tokens[0].clone()).as_str();
-                } else {
-                    res += format!(
-                        "let mut {}: {}",
-                        self.transpile(tokens[1].clone()),
-                        self.transpile(tokens[0].clone())
-                    )
-                    .as_str();
-                }
-            }
-            Rule::var_def_set => {
-                res += format!(
-                    "{} = {}",
-                    self.transpile(tokens[0].clone()),
-                    self.transpile(tokens[1].clone()),
-                )
-                .as_str();
-            }
-            Rule::curly => {
-                res += "{";
-                res += &self.transpile_pairs(pair.clone().into_inner());
-                res += "}";
-            }
-            Rule::code_expr => {
-                res += &self.transpile_pairs(pair.clone().into_inner());
-            }
-
-            Rule::include_global => {
-                res += "#[allow(unused_imports)]\nuse ";
-                res += self
-                    .mod_manager
-                    .add(&mut self.clone(), tokens[0].as_str().to_string(), true)
-                    .as_str();
-                res += "::*;\n";
-            }
-            Rule::include => {
-                res += "#[allow(unused_imports)]\nuse ";
-                res += self
-                    .mod_manager
-                    .add(&mut self.clone(), tokens[0].as_str().to_string(), false)
-                    .as_str();
-                res += "::*;\n";
-            }
-
-            Rule::identifier | Rule::def_identifier => {
-                res += self.encode_ident(pair.as_str().trim()).as_str();
-            }
-
-            Rule::call => {
-                res += " ";
-                res += self.transpile(tokens[0].clone()).as_str();
-                res += self.transpile(tokens[1].clone()).as_str();
-            }
-
-            Rule::round => {
-                res += "(";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-                res += ")";
-            }
-
-            Rule::expr => {
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::term => {
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::struct_def => {
-                res += "struct ";
-                res += self.transpile(tokens[0].clone()).as_str();
-                res += "{";
-                res += self.transpile(tokens[1].clone()).as_str();
-                res += "}";
-            }
-
-            Rule::semicolon => {
-                res += ";\n";
-            }
-
-            Rule::string => {
-                res += pair.as_str();
-            }
-
-            Rule::map => {
-                self.mod_manager.map.insert(
-                    tokens[0].as_str().to_string(),
-                    tokens[2].as_str().to_string(),
-                );
-            }
-
-            Rule::enum_def => {
-                res += format!(
-                    "enum {} {}{}{}",
-                    self.transpile(tokens[0].clone()),
-                    "{",
-                    self.transpile_pairs(tokens[1].clone().into_inner()),
-                    "}\n"
-                )
-                .as_str();
-            }
-
-            Rule::ecall => {
-                res += self.transpile(tokens[0].clone()).as_str();
-                if tokens.len() > 1 {
-                    let mut params = tokens.clone();
-                    params.remove(0);
-                    res += "(";
-                    res += self.transpile_vec(params).as_str();
-                    res += ")";
-                }
-            }
-
-            Rule::comma => {
-                res += ",";
-            }
-
-            Rule::ptr_set => {
-                res += format!(
-                    "*{} = {}",
-                    self.transpile(tokens[0].clone()),
-                    self.transpile(tokens[1].clone()),
-                )
-                .as_str();
-            }
-
-            Rule::int => {
-                res += " ";
-                res += pair.as_str();
-                res += " ";
-            }
-
-            Rule::refrence => {
-                res += "&mut ";
-                res += self.transpile(tokens[0].clone()).as_str();
-            }
-
-            Rule::return_stm => {
-                res += "return ";
-                res += self.transpile(tokens[0].clone()).as_str();
-            }
-
-            Rule::if_stm => {
-                res += "if ";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::else_if_stm => {
-                res += "else if ";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::else_stm => {
-                res += "else ";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::bool => {
-                res += pair.as_str();
-            }
-
-            Rule::operator => {
-                res += pair.as_str();
-            }
-
-            Rule::if_operator => {
-                res += pair.as_str();
-            }
-
-            Rule::if_expr => {
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::namespace_def => {
-                res += "mod ";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::top_code => {
-                res += "{";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-                res += "}";
-            }
-
-            Rule::top_expr => {
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::impl_def => {
-                res += "impl ";
-                res += self.transpile_pairs(pair.into_inner()).as_str();
-            }
-
-            Rule::match_name => {
-                let to_match = tokens[0].clone().as_str();
-                let match_id = tokens[1].clone().as_str();
-                res += "\n";
-                res += self.encode_ident(to_match).as_str();
-                res += "<match:";
-                res += match_id;
-                res += ">";
-            }
-
-            Rule::operation => {
-                for i in 0..tokens.len() {
-                    let token = tokens[i].clone();
-                    if i % 2 == 0 {
-                        res += self.transpile(token).as_str();
-                    } else {
-                        res += token.as_str();
-                    }
-                }
-            }
-
-            _ => {
-                println!("\x1b[33mNot Handled: {}\x1b[0m", pair);
-                res += " ";
-                res += pair.as_str();
-                res += " ";
-            }
-        }
-        res
-    }
-    pub fn transpile_code(&mut self, code: String, indent: usize) -> Result<String, Error<Rule>> {
-        let mut res = String::new();
-        match WystParser::parse(Rule::top_expr, &code) {
-            Ok(parsed) => {
-                for pair in parsed {
-                    res += self.transpile_pairs(pair.into_inner()).as_str();
-                }
-            }
-            Err(e) => {
-                return Err(e);
-            }
-        }
-        if indent > 0 {
-            res += " ".repeat(indent * 2).as_str();
-        }
-
-        if indent > 0 {
-            res += "\n";
-            res += " ".repeat((indent - 1) * 2).as_str();
-        }
-        Ok(res)
-    }
-}

src/utils.rs

@@ -1,273 +0,0 @@
-use crate::transpiler::{Rule, State, Transpiler, WystParser};
-use dirs::home_dir;
-use pest::Parser;
-use rand::random;
-use regex::Regex;
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::fs;
-use std::path::Path;
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum ProblemType {
-    VariableNotFound,
-    FileNotFound,
-    HeaderSyntaxError,
-    SyntaxError,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub enum ProblemCap {
-    Error(Problem),
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Problem {
-    pub problem_type: ProblemType,
-    pub problem_msg: String,
-    pub state: State,
-}
-
-#[derive(Debug, Clone)]
-pub struct Module {
-    pub rs_mod: String,
-    pub file_path: String,
-    pub code: String,
-}
-
-#[derive(Debug, Clone)]
-pub struct ModManager {
-    pub modules: Vec<Module>,
-    pub macros: Vec<String>,
-    pub map: HashMap<String, String>,
-}
-
-impl ModManager {
-    pub fn new() -> ModManager {
-        ModManager {
-            modules: Vec::new(),
-            macros: Vec::new(),
-            map: HashMap::new(),
-        }
-    }
-    pub fn check(&mut self, path: String) -> Option<Module> {
-        for module in self.modules.clone() {
-            if module.file_path == path {
-                return Some(module);
-            }
-        }
-        None
-    }
-    pub fn add(&mut self, root: &mut Transpiler, file_path: String, global: bool) -> String {
-        let mut problems: Vec<ProblemCap> = Vec::new();
-        let mod_name = format!("mod_{}", self.modules.len());
-        let home_dirpb = home_dir().unwrap();
-        let home_dir = home_dirpb.to_str().unwrap();
-        let mut file_path = file_path;
-        if global {
-            let mut tmp = Path::new(home_dir)
-                .join("wyst")
-                .join("lib")
-                .join(file_path.clone())
-                .to_str()
-                .unwrap()
-                .to_string();
-            if !Path::new(&tmp).exists() {
-                tmp = Path::new("lib")
-                    .join(file_path)
-                    .to_str()
-                    .unwrap()
-                    .to_string();
-            }
-            file_path = tmp;
-        }
-        if let Some(modl) = self.check(file_path.clone()) {
-            return modl.rs_mod;
-        }
-        if let Ok(code) = fs::read_to_string(file_path.clone()) {
-            match file_path.rsplit_once('.').unwrap_or(("", "")).1 {
-                "rs" => match WystParser::parse(Rule::rust_code, &code) {
-                    Ok(parsed) => {
-                        self.modules.push(Module {
-                            rs_mod: mod_name.clone(),
-                            file_path: file_path.clone(),
-                            code: code.clone(),
-                        });
-                        for pair in parsed {
-                            for p in pair.into_inner() {
-                                if p.as_rule() == Rule::rust_macro_lint {
-                                    self.macros.push(p.into_inner().as_str().to_string());
-                                }
-                            }
-                        }
-                    }
-                    Err(_) => {}
-                },
-                "h" => {
-                    file_path = file_path.rsplit_once('.').unwrap_or(("", "")).0.to_string();
-                    file_path += ".rs";
-                    let parsed = WystParser::parse(Rule::header_expr, &code).unwrap();
-                    for pair in parsed {
-                        root.transpile_pairs(pair.into_inner());
-                    }
-                    self.map.extend(root.mod_manager.map.clone().into_iter());
-                    if let Ok(code1) = fs::read_to_string(file_path.clone()) {
-                        let parsed = WystParser::parse(Rule::rust_code, &code1).unwrap();
-                        self.modules.push(Module {
-                            rs_mod: mod_name.clone(),
-                            file_path: file_path.clone(),
-                            code: code1.clone(),
-                        });
-                        for pair in parsed {
-                            for p in pair.into_inner() {
-                                if p.as_rule() == Rule::rust_macro_lint {
-                                    self.macros.push(p.into_inner().as_str().to_string());
-                                }
-                            }
-                        }
-                    } else {
-                        problems.push(ProblemCap::Error(Problem {
-                            problem_msg: format!("Sub Header not found '{}'", file_path),
-                            problem_type: ProblemType::FileNotFound,
-                            state: State {
-                                line: 0,
-                                column: 0,
-                                file: None,
-                            },
-                        }))
-                    }
-                }
-                _ => {}
-            }
-        } else {
-            problems.push(ProblemCap::Error(Problem {
-                problem_msg: format!("File not found '{}'", file_path),
-                problem_type: ProblemType::FileNotFound,
-                state: State {
-                    line: 0,
-                    column: 0,
-                    file: None,
-                },
-            }))
-        }
-        mod_name
-    }
-    pub fn write(&mut self) -> Vec<ProblemCap> {
-        let mut problems: Vec<ProblemCap> = Vec::new();
-        for module in self.modules.clone() {
-            let file_path = module.file_path;
-            match file_path.rsplit_once('.').unwrap_or(("", "")).1 {
-                "wst" => {
-                    let mut trsp = Transpiler {
-                        mod_manager: self.clone(),
-                        ..Default::default()
-                    };
-                    let rust_code = trsp.transpile_code(module.code, 0).expect("");
-                    fs::write(
-                        Path::new("build").join((module.rs_mod + ".rs").as_str()),
-                        rust_code,
-                    )
-                    .expect("Error writing rust file: ");
-                    problems.append(&mut trsp.problems);
-                    self.modules = trsp.mod_manager.modules;
-                }
-
-                "rs" => fs::write(
-                    Path::new("build").join((module.rs_mod + ".rs").as_str()),
-                    &module.code,
-                )
-                .unwrap(),
-
-                _ => {}
-            }
-        }
-        problems
-    }
-}
-#[derive(Debug, Clone)]
-#[allow(dead_code)]
-pub struct MatchError {
-    msg: String,
-}
-
-pub fn match_code(code: String, line: usize, column: usize) -> Result<String, MatchError> {
-    let re_include = Regex::new(r#"\#\s*include\s*(<|\")([a-zA-Z0-9_.-]*)$"#).unwrap();
-    let re_ident = Regex::new(r#"(\:\:|[_a-zA-Z])(\:\:|[_a-zA-Z0-9])*$"#).unwrap();
-    let mut lines: Vec<&str> = code.split("\n").collect();
-    if lines.len() >= line {
-        let result = &lines[line][..column];
-        if let Some(caps) = re_include.captures(&result) {
-            let match_id: u16 = random();
-            return Ok(format!("<match_file:{}:_{}>", &caps[0], match_id));
-        } else if let Some(caps) = re_ident.captures(&result) {
-            let match_id: u16 = random();
-            let match_line = format!("<match:{}:_{}>", &caps[0], match_id);
-            lines[line] = match_line.as_str();
-            let mut trsp = Transpiler::default();
-            match trsp.transpile_code(lines.join("\n"), 0) {
-                Ok(rs_code) => {
-                    return Ok(rs_code);
-                }
-                Err(_) => {
-                    return Err(MatchError {
-                        msg: "Syntax error".to_string(),
-                    });
-                }
-            }
-        }
-    }
-    Err(MatchError {
-        msg: "last resort empty".to_string(),
-    })
-}
-
-pub const LOGO: &str = r#"
-
-
-                                @@     @@@      @                                
-                               @@@@   @@@@@   @@@@                               
-                        @@@@   @@@@@@@@@@@@@@@@@@@   @@@@                        
-                        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@                        
-                 @@@@@@@@@@@@@@@@@@@@@    @@@@@@@@@@@@@@@@@@@@@@                 
-                  @@@@@@@@@@@@@@@@@@@@     @@@@@@@@@@@@@@@@@@@@                  
-            @@@  @@@@@@@@@@@@@@@    @@@@@@@@@    @@@@@@@@@@@@@@@  @@@            
-            @@@@@@@@@@@@@@@          @@@@@@           @@@@@@@@@@@@@@@            
-            @@@@@@@@@@@@                @                @@@@@@@@@@@@            
-       @@@@@@@@@@@@@@@                                     @@@@@@@@@@   @@       
-       @@@@@@@@@@@@@                                         @@@@@@@@@@@@@       
-        @@@@@@@@@@                                             @@@@@@@@@@        
-        @@@@@@@@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@        
-   @@@@@@@@@@@@@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@   
-    @@@@@@@@@@@@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@    
-     @@@@@@@@@@@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@     
-     @@@@@    @@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@    @@@@@     
- @@@@@@@@@    @@@@@@@@@@@@@@        @@@@@@@@@@@@       @@@@@@@@@@@@    @@@@@@@@@ 
- @@@@@@@@@@@@@@@@@@@@@@@@@@@@      @@@@@@@@@@@@@       @@@@@@@@@@@@@@@@@@@@@@@@@ 
-   @@@@@@@@@@@  @@@@@@@@@@@@@      @@@@@@@@@@@@@@     @@@@@@@@@@   @@@@@@@@@@@   
-   @@@@@@@@      @@@@@@@@@@@@@    @@@@@@@@@@@@@@@@    @@@@@@@@@       @@@@@@@@   
-@@@@@@@@@@@       @@@@@@@@@@@@@   @@@@@@@@@@@@@@@@   @@@@@@@@@@       @@@@@@@@@@@
-@@@@@@@@@@@       @@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@  @@@@@@@@@        @@@@@@@@@@@
-   @@@@@@@@        @@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@        @@@@@@@@   
-   @@@@@@@@         @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@         @@@@@@@@   
- @@@@@@@@@@@        @@@@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@        @@@@@@@@@@@ 
- @@@@@@@@@@@         @@@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@         @@@@@@@@@@@ 
-     @@@@@@@@         @@@@@@@@@@@@@@@@@@  @@@@@@@@@@@@@@@@@@        @@@@@@@@     
-     @@@@@@@@@        @@@@@@@@@@@@@@@@@    @@@@@@@@@@@@@@@@        @@@@@@@@@     
-    @@@@@@@@@@@        @@@@@@@@@@@@@@@@    @@@@@@@@@@@@@@@@        @@@@@@@@@@    
-   @@@@@@@@@@@@@        @@@@@@@@@@@@@@      @@@@@@@@@@@@@@       @@@@@@@@@@@@@   
-        @@@@@@@@@       @@@@@@@@@@@@@@      @@@@@@@@@@@@@@      @@@@@@@@@        
-        @@@@@@@@@@      @                                      @@@@@@@@@@        
-       @@@@@@@@@@@@@@@@@@@@                           @@@@@@@@@@@@@@@@@@@@       
-       @@@  @@@@@@@@@   @@@                          @@@@   @@@@@@@@@  @@@       
-            @@@@@@@@     @@@                         @@@     @@@@@@@@            
-            @@@@@@@@@   @@@@                         @@@@   @@@@@@@@@            
-            @@@  @@@@@@@@@@@@@@@@@             @@@@@@@@@@@@@@@@@  @@@            
-                  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@                  
-                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@                 
-                        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@                        
-                        @@@@   @@@@@@@@@@@@@@@@@@@   @@@@                        
-                               @@@@   @@@@@   @@@@                               
-                                @@     @@@     @@                                
-
-
-"#;

src/wyst.pest

@@ -1,121 +0,0 @@
-WHITESPACE = _{ ("//" ~ (!"\n" ~ ANY)*) | ("/*" ~ (!"*/" ~ ANY)*) | " " | "\t" | "\n" }
-
-// [chars]
-comma = {","}
-semicolon = {";"}
-dot = {"."}
-
-// [literals]
-filepath = { ("/"|('a'..'z' | 'a'..'z' | '0'..'9' | "_" | "-" | "."))+ }
-include = { "#" ~ "include" ~ "\"" ~ filepath ~ "\"" }
-include_global = { "#" ~ "include" ~ "<" ~ filepath ~ ">" }
-round = { "(" ~ ((expr ~ comma)* ~ expr?) ~ ")" }
-curly = { "{" ~ (code_expr)* ~ "}" }
-escape = { "\\" ~ ANY }
-raw_string = { (!("\\" | "\"") ~ ANY)+ }
-string = { "\"" ~ (raw_string | escape )* ~ "\"" }
-char = { "'" ~ (escape | ANY) ~ "'" }
-bool = @{"true" | "false"}
-keyword = @{"struct"|"return"}
-map = { "#" ~ "map" ~ identifier ~ comma ~ identifier }
-match_name = { "<match:" ~ identifier ~ ":" ~ identifier ~ ">" }
-
-// [numbers]
-hex = @{ "0" ~ ("x"|"X") ~ ('0'..'9' | 'a'..'f' | 'A'..'F')*}
-float = @{ ('0'..'9')* ~ "." ~ ('0'..'9')+ }
-int = @{ '0'..'9'+ }
-
-// [identifiers]
-identifier = @{ !(hex|float|int) ~ ("." | "::" | "_" | 'a'..'z' | 'A'..'Z') ~ ( "." | "::" | "_" | 'a'..'z' | 'A'..'Z' | int )*}
-def_identifier = {identifier ~ ("<" ~ ((def_identifier ~ comma)* ~ def_identifier?) ~ ">")?}
-
-// [definitions]
-round_def = { "(" ~ ((var_def ~ comma)* ~ var_def?) ~ ")" }
-curly_def = { "{" ~ (var_def ~ semicolon)* ~ "}" }
-var_def = { (def_identifier ~ identifier) | var_def_ptr }
-var_def_ptr = { def_identifier ~ "*" ~ identifier }
-var_def_set = { var_def ~ "=" ~ expr }
-var_set = { def_identifier ~ "=" ~ expr }
-func_def = { def_identifier ~ identifier ~ round_def ~ curly }
-struct_def = { "struct" ~ identifier ~ curly_def }
-ecall = { identifier ~ ( "(" ~ ((def_identifier ~ comma)* ~ def_identifier?) ~ ")" )? }
-ecurly = { "{" ~ ((ecall ~ comma)* ~ ecall?) ~ "}" }
-enum_def = { "enum" ~ identifier ~ ecurly }
-top_code = {"{"~ top_expr ~"}"}
-namespace_def = {"namespace" ~ identifier ~ top_code}
-impl_def = {"impl" ~ identifier ~ top_code}
-
-// [Ptr]
-ptr_fn_def = { def_identifier ~ "*" ~ identifier ~ round_def ~ curly }
-ptr_set = { "*" ~ identifier ~ "=" ~ expr }
-refrence = { "&" ~ identifier }
-
-// [Operators]
-if_operator = {"&&"|"||"}
-operator = {"=="|"+"|"-"|"!="|">"|"<"|">="|"<="}
-if_expr = {expr ~ (if_operator ~ (("("~if_expr*~")")|expr))*}
-operation = {(term ~ operator)+ ~ term}
-
-// [Statement]
-return_stm = { "return" ~ expr }
-if_stm = { "if" ~ if_expr ~ curly }
-else_if_stm = { "else" ~ "if" ~ if_expr ~ curly }
-else_stm = { "else" ~ curly }
-
-rust_macro_lint = { "macro_rules" ~ "!" ~ identifier }
-rust_code = { (rust_macro_lint | ANY)* }
-
-call = {identifier ~ round}
-
-term = {
-    call |
-    round |
-    char |
-    hex |
-    float |
-    int |
-    bool |
-    identifier |
-    string |
-    refrence |
-    match_name
-}
-
-expr = {
-    operation |
-    (term ~ dot ~ identifier ~ round?) |
-    term
-}
-
-code_expr = {
-    ((
-        return_stm |
-        var_def_set|
-        var_def |
-        var_set |
-        ptr_set |
-        expr
-    ) ~ semicolon) | 
-    if_stm |
-    else_if_stm |
-    else_stm
-}
-
-top_expr = {
-    (
-        func_def |
-        namespace_def |
-        include |
-        include_global |
-        ptr_fn_def |
-        struct_def |
-        enum_def |
-        map |
-        impl_def |
-        match_name
-    )*
-}
-
-header_expr = {
-  map*
-}

test/main.wst

@@ -0,0 +1,2 @@
+%map test, hi;
+int main(test x) {}