Tool v1

.gitignore

@@ -9,3 +9,11 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# Ignore local vscode settings
+**/.vscode/settings.json
+
+# Ignore Typescript files
+out
+node_modules
+.vscode-test

Cargo.toml

@@ -1,4 +1,4 @@
 [workspace]
 
-members = ["core_lang", "forc", "test_suite"]
+members = ["core_lang", "forc", "test_suite", "fume-server"]
 

core_lang/src/ident.rs

@@ -5,12 +5,12 @@ use pest::Span;
 use std::hash::{Hash, Hasher};
 #[derive(Debug, Clone)]
 pub struct Ident<'sc> {
-    pub(crate) primary_name: &'sc str,
+    pub primary_name: &'sc str,
     // sub-names are the stuff after periods
     // like x.test.thing.method()
     // `test`, `thing`, and `method` are sub-names
     // the primary name is `x`
-    pub(crate) span: Span<'sc>,
+    pub span: Span<'sc>,
 }
 
 // custom implementation of Hash so that namespacing isn't reliant on the span itself, which will

core_lang/src/lib.rs

@@ -11,7 +11,7 @@ mod parse_tree;
 mod parser;
 mod semantic_analysis;
 
-use crate::parse_tree::*;
+pub use crate::parse_tree::*;
 use crate::parser::{HllParser, Rule};
 use crate::{asm_generation::compile_ast_to_asm, error::*};
 pub use asm_generation::{AbstractInstructionSet, FinalizedAsm, HllAsmSet};
@@ -20,10 +20,9 @@ use pest::iterators::Pair;
 use pest::Parser;
 use semantic_analysis::{TreeType, TypedParseTree};
 use std::collections::HashMap;
-
 pub(crate) mod types;
 pub(crate) mod utils;
-pub(crate) use crate::parse_tree::{Expression, UseStatement, WhileLoop};
+pub use crate::parse_tree::{Declaration, Expression, UseStatement, WhileLoop};
 
 pub use error::{CompileError, CompileResult, CompileWarning};
 pub use ident::Ident;
@@ -59,18 +58,18 @@ pub struct ParseTree<'sc> {
     /// In a typical programming language, you might have a single root node for your syntax tree.
     /// In this language however, we want to expose multiple public functions at the root
     /// level so the tree is multi-root.
-    root_nodes: Vec<AstNode<'sc>>,
-    span: Span<'sc>,
+    pub root_nodes: Vec<AstNode<'sc>>,
+    pub span: Span<'sc>,
 }
 
 #[derive(Debug, Clone)]
-struct AstNode<'sc> {
-    content: AstNodeContent<'sc>,
-    span: Span<'sc>,
+pub struct AstNode<'sc> {
+    pub content: AstNodeContent<'sc>,
+    pub span: Span<'sc>,
 }
 
 #[derive(Debug, Clone)]
-pub(crate) enum AstNodeContent<'sc> {
+pub enum AstNodeContent<'sc> {
     UseStatement(UseStatement<'sc>),
     ReturnStatement(ReturnStatement<'sc>),
     Declaration(Declaration<'sc>),

core_lang/src/parse_tree/call_path.rs

@@ -7,8 +7,8 @@ use pest::Span;
 /// in the expression `a::b::c()`, `a` and `b` are the prefixes and `c` is the suffix.
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct CallPath<'sc> {
-    pub(crate) prefixes: Vec<Ident<'sc>>,
-    pub(crate) suffix: Ident<'sc>,
+    pub prefixes: Vec<Ident<'sc>>,
+    pub suffix: Ident<'sc>,
 }
 
 impl<'sc> std::convert::From<Ident<'sc>> for CallPath<'sc> {

core_lang/src/parse_tree/code_block.rs

@@ -10,8 +10,8 @@ use pest::Span;
 use std::collections::HashMap;
 
 #[derive(Debug, Clone)]
-pub(crate) struct CodeBlock<'sc> {
-    pub(crate) contents: Vec<AstNode<'sc>>,
+pub struct CodeBlock<'sc> {
+    pub contents: Vec<AstNode<'sc>>,
     pub(crate) scope: HashMap<&'sc str, Declaration<'sc>>,
     pub(crate) whole_block_span: Span<'sc>,
 }

core_lang/src/parse_tree/declaration/enum_declaration.rs

@@ -11,7 +11,7 @@ use pest::iterators::Pair;
 use pest::Span;
 #[derive(Debug, Clone)]
 pub struct EnumDeclaration<'sc> {
-    pub(crate) name: Ident<'sc>,
+    pub name: Ident<'sc>,
     pub(crate) type_parameters: Vec<TypeParameter<'sc>>,
     pub(crate) variants: Vec<EnumVariant<'sc>>,
     pub(crate) span: Span<'sc>,

core_lang/src/parse_tree/declaration/function_declaration.rs

@@ -22,10 +22,10 @@ impl Visibility {
 }
 
 #[derive(Debug, Clone)]
-pub(crate) struct FunctionDeclaration<'sc> {
-    pub(crate) name: Ident<'sc>,
+pub struct FunctionDeclaration<'sc> {
+    pub name: Ident<'sc>,
     pub(crate) visibility: Visibility,
-    pub(crate) body: CodeBlock<'sc>,
+    pub body: CodeBlock<'sc>,
     pub(crate) parameters: Vec<FunctionParameter<'sc>>,
     pub(crate) span: pest::Span<'sc>,
     pub(crate) return_type: TypeInfo<'sc>,

core_lang/src/parse_tree/declaration/impl_trait.rs

@@ -5,7 +5,7 @@ use pest::iterators::Pair;
 use pest::Span;
 
 #[derive(Debug, Clone)]
-pub(crate) struct ImplTrait<'sc> {
+pub struct ImplTrait<'sc> {
     pub(crate) trait_name: CallPath<'sc>,
     pub(crate) type_implementing_for: TypeInfo<'sc>,
     pub(crate) type_arguments: Vec<TypeParameter<'sc>>,
@@ -18,7 +18,7 @@ pub(crate) struct ImplTrait<'sc> {
 /// An impl of methods without a trait
 /// like `impl MyType { fn foo { .. } }`
 #[derive(Debug, Clone)]
-pub(crate) struct ImplSelf<'sc> {
+pub struct ImplSelf<'sc> {
     pub(crate) type_implementing_for: TypeInfo<'sc>,
     pub(crate) type_arguments: Vec<TypeParameter<'sc>>,
     pub(crate) functions: Vec<FunctionDeclaration<'sc>>,

core_lang/src/parse_tree/declaration/mod.rs

@@ -14,7 +14,7 @@ pub(crate) use reassignment::*;
 pub(crate) use struct_declaration::*;
 pub(crate) use trait_declaration::*;
 pub(crate) use type_parameter::*;
-pub(crate) use variable_declaration::*;
+pub use variable_declaration::*;
 
 use crate::error::*;
 use crate::parse_tree::Expression;
@@ -24,7 +24,7 @@ use crate::Ident;
 use pest::iterators::Pair;
 
 #[derive(Debug, Clone)]
-pub(crate) enum Declaration<'sc> {
+pub enum Declaration<'sc> {
     VariableDeclaration(VariableDeclaration<'sc>),
     FunctionDeclaration(FunctionDeclaration<'sc>),
     TraitDeclaration(TraitDeclaration<'sc>),

core_lang/src/parse_tree/declaration/reassignment.rs

@@ -6,11 +6,11 @@ use pest::iterators::Pair;
 use pest::Span;
 
 #[derive(Debug, Clone)]
-pub(crate) struct Reassignment<'sc> {
+pub struct Reassignment<'sc> {
     // the thing being reassigned
-    pub(crate) lhs: Ident<'sc>,
+    pub lhs: Ident<'sc>,
     // the expression that is being assigned to the lhs
-    pub(crate) rhs: Expression<'sc>,
+    pub rhs: Expression<'sc>,
     pub(crate) span: Span<'sc>,
 }
 

core_lang/src/parse_tree/declaration/struct_declaration.rs

@@ -11,7 +11,7 @@ use super::Visibility;
 
 #[derive(Debug, Clone)]
 pub struct StructDeclaration<'sc> {
-    pub(crate) name: Ident<'sc>,
+    pub name: Ident<'sc>,
     pub(crate) fields: Vec<StructField<'sc>>,
     pub(crate) type_parameters: Vec<TypeParameter<'sc>>,
     pub(crate) visibility: Visibility,

core_lang/src/parse_tree/declaration/trait_declaration.rs

@@ -9,8 +9,8 @@ use pest::iterators::Pair;
 use pest::Span;
 
 #[derive(Debug, Clone)]
-pub(crate) struct TraitDeclaration<'sc> {
-    pub(crate) name: Ident<'sc>,
+pub struct TraitDeclaration<'sc> {
+    pub name: Ident<'sc>,
     pub(crate) interface_surface: Vec<TraitFn<'sc>>,
     pub(crate) methods: Vec<FunctionDeclaration<'sc>>,
     pub(crate) type_parameters: Vec<TypeParameter<'sc>>,