fix: Make code compile

Make code compile

Author: ArtInLines

lib/Cargo.toml

@@ -1,11 +1,13 @@
-[package]
-name = "lib"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-tracing = "0.1.37"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+[package]
+name = "lib"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tracing = "0.1.37"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+pest = "2.5.7"
+pest_derive = "2.6.0"

lib/src/codegen/ir.rs

@@ -203,6 +203,7 @@ pub struct NameAndType {
 /// The instructions for the JVM
 /// https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-6.html#jvms-6.5.areturn
 pub(crate) enum Instruction {
+    aload_0,
     aload(u8),        //Load reference from local variable
     iload(u8),        //Load int from local variable
     ifeq(u16),        //Branch if int is 0
@@ -427,6 +428,7 @@ mod tests {
         let field = FieldDecl {
             field_type: Type::Int,
             name: String::from("test"),
+            val: None,
         };
         let ir_field = generate_field(&field, &mut constant_pool);
         assert_eq!(ir_field.name_index, 1);

lib/src/parser/ExampleGrammar.pest

@@ -0,0 +1,3 @@
+ID = {ASCII_ALPHA_UPPER~ASCII_ALPHA+}
+Name = {ID~","~ID}
+List = {(Name~"\n")+}

src/JavaGrammar.pest lib/src/parser/JavaGrammar.pest

@@ -1,9 +1,3 @@
-//! Grammar~doc
-ID = {ASCII_ALPHA_UPPER~ASCII_ALPHA+}
-Name = {ID~","~ID}
-List = {(Name~"\n")+}
-
-
 IDENTIFIER ={(ASCII_ALPHA|"_")~(ASCII_ALPHANUMERIC|"_")* }
 
 compilationunit = {classdeclaration+ }

lib/src/parser/mod.rs

@@ -1,3 +1,5 @@
 mod parser;
 #[cfg(test)]
 mod test;
+
+pub use parser::*;

src/parser.rs lib/src/parser/parser.rs

@@ -1,15 +1,15 @@
 extern crate pest;
 extern crate pest_derive;
 
+use super::*;
 use pest::error::Error;
+use pest::iterators::Pair;
 use pest::Parser;
 use pest_derive::Parser;
 use serde::{Deserialize, Serialize};
-use pest::iterators::Pair;
-
 
 #[derive(Parser)]
-#[grammar = "JavaGrammar.pest"]
+#[grammar = "src/parser/ExampleGrammar.pest"]
 struct ExampleParser;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -22,21 +22,20 @@ pub enum Example {
 pub fn parse_Example(file: &str) -> Result<Example, Error<Rule>> {
     let example: Pair<Rule> = ExampleParser::parse(Rule::List, file)?.next().unwrap();
 
+    Ok(parse_value(example))
+}
 
-    fn parse_value(pair: Pair<Rule>) -> Example {
-        match pair.as_rule() {
-            Rule::ID => Example::ID(String::from(pair.as_str())),
-            Rule::Name => Name(pair: Pair<Rule>),
-            Rule::List => Example::List(pair.into_inner().map(parse_value).collect()),
-        }
+fn parse_value(pair: Pair<Rule>) -> Example {
+    match pair.as_rule() {
+        Rule::ID => Example::ID(String::from(pair.as_str())),
+        Rule::Name => Name(pair),
+        Rule::List => Example::List(pair.into_inner().map(parse_value).collect()),
     }
-
-    Ok(parse_value(example))
 }
-pub fn Name(pair: Pair<Rule>)->Example::Name
-{
+
+pub fn Name(pair: Pair<Rule>) -> Example {
     let mut pairs = pair.into_inner();
     let a = parse_value(pairs.next().unwrap());
     let b = parse_value(pairs.next().unwrap());
-  return  Example::Name(Box::new(a), Box::new(b))
-}
+    return Example::Name(Box::new(a), Box::new(b));
+}

lib/src/parser/test.rs

@@ -1,9 +1,11 @@
+use super::*;
+
 #[test]
-fn testtest() -> bool {
+fn testtest() {
     let test: Example = parse_Example(
         "Val,Richter\nBene,Brandmeier\nMario,Hinkel\nMaxi,Floto\nPflipper,Wolf\nTori,Gonnheimer\nSander,Stella\n",
     )
         .expect("u suck");
+    // TODO: Use asserts or something, not println
     println!("{}", serde_json::to_string(&test).unwrap());
-    true
 }

lib/src/tests/to_java.rs

@@ -148,9 +148,10 @@ pub fn expr_to_java(expr: &Expr) -> String {
         Expr::Integer(i) => i.to_string(),
         Expr::Jnull => "null".to_string(),
         Expr::LocalOrFieldVar(var) => var.to_owned(),
+        Expr::LocalVar(var) => var.to_owned(),
+        Expr::FieldVar(var) => var.to_owned(),
         Expr::StmtExprExpr(stmt_expr) => stmt_expr_to_java(stmt_expr),
         Expr::String(s) => format!("\"{}\"", s),
-        Expr::Super => "super".to_string(),
         Expr::This => "this".to_string(),
         Expr::TypedExpr(expr, typ) => expr_to_java(expr),
         Expr::Unary(op, expr) => format!("{}({})", op, expr_to_java(expr)),

src/main.rs

@@ -1,5 +1,3 @@
-use parser::Example;
-use parser::*;
 use lib::typechecker::typechecker;
 use lib::types::{Class, Expr, FieldDecl, MethodDecl, Prg, Stmt, StmtExpr, Type};
 use serde_json::Value;