📝 chore: Add types to AST

Author: john-bv

src/compiler/typesharp_ast/ast.rs

@@ -2,6 +2,7 @@
 // use crate::{ typesharp_parser::Module };
 use super::position::{ Position };
 use super::op::*;
+use super::types;
 use crate::{ compiler::typesharp_lexer::token::Token };
 
 pub struct AST {
@@ -53,14 +54,20 @@ pub struct ASTStatement {
 #[derive(Clone, PartialEq, Debug)]
 pub enum ASTStateBody {
 	// expressions, function calls, returns etc should be here.
-	FuncCall(Signature)
+	FuncCall(Signature),
+	Expression(Expression),
+	StackVar(Var),
+	Constant(HeapVar),
+	AnyConstant(AnyVar),
+	If(Conditional)
 }
 
 // Context and definitions
 /// A variable, const, class, etc.
 #[derive(Clone, PartialEq, Debug)]
 pub struct Var {
 	pub op: Option<AnyOp>,
+	pub typ: Option<types::Type>,
 	pub val: Token,
 	pub pos: Position,
 	pub dies: bool,
@@ -93,7 +100,9 @@ pub struct Expression {
 	pub v: Vec<AnyVar>
 }
 
+#[derive(Clone, PartialEq, Debug)]
 pub struct Conditional {
 	pub condition: Expression,
-	pub body: Vec<ASTStatement>
+	pub body: Vec<ASTStatement>,
+	pub fin: Option<Vec<ASTStatement>>
 }

src/compiler/typesharp_ast/mod.rs

@@ -3,6 +3,7 @@ pub mod position;
 pub mod keyword;
 pub mod cursor;
 pub mod op;
+pub mod types;
 
 pub use self::{
      position::{ Position, Span },

src/compiler/typesharp_ast/types/builtin.rs

@@ -0,0 +1 @@
+// this is used by the parser

src/compiler/typesharp_ast/types/compiler.rs

@@ -0,0 +1 @@
+// this is used by the parser

src/compiler/typesharp_ast/types/mod.rs

@@ -1,4 +1,8 @@
 // This is a module that handles internal classes and types.
+pub mod builtin;
+pub mod compiler;
+use super::{ ast };
+
 #[derive(Clone, PartialEq, Debug)]
 pub struct Type {
 	pub name: String,
@@ -7,10 +11,12 @@ pub struct Type {
 
 #[derive(Clone, PartialEq, Debug)]
 pub struct TypeDefinition {
-	pub func: TypeSignature
+	/// Used for linting and more descriptive errors
+	pub calculated_defs: Option<Vec<ast::Conditional>>,
+	pub defs: Option<Vec<ast::AnyVar>>
 }
 
-#[derive(Clone, PartialEq, Debug)]
-pub struct TypeSignature {
-	
-}
+pub use self::{
+	builtin::*,
+	compiler::*
+};

src/compiler/typesharp_parser/mod.rs

@@ -0,0 +1 @@
+mod parser;

src/compiler/typesharp_parser/parse.rs renamed to src/compiler/typesharp_parser/parser.rs

@@ -0,0 +1,21 @@
+#![allow(non_snake_case)]
+pub mod compiler;
+pub mod error;
+//pub mod parser_h::{ parser, compile };
+
+fn main() {
+	let code = "use std.math;
+	/*const mychild: string = 10;
+	const newval = (int) mychild;
+	debug!(newval); // Number<u8, 10>
+	*/";
+	let lexed = compiler::typesharp_lexer::tokenize(&code);
+	let val = lexed.len();
+
+	for token in lexed {
+		println!("Found: {:?}", token);
+	}
+
+	println!("There are: {} tokens.", val);
+	//compile(parser::parse(lexed));
+}