browser-rs: clean up js

Author: d0iasm

app/browser-rs/src/renderer/js/mod.rs

@@ -1,6 +1,5 @@
 pub mod css;
 pub mod html;
-pub mod js;
 pub mod layout;
 
 use crate::gui::ApplicationWindow;
@@ -13,9 +12,9 @@ use alloc::rc::Rc;
 use alloc::string::String;
 use core::cell::RefCell;
 use liumlib::*;
-use saji::ast::Parser;
-use saji::runtime::Runtime;
-use saji::token::Lexer;
+use saji::ast::JsParser;
+use saji::runtime::JsRuntime;
+use saji::token::JsLexer;
 
 pub fn render(html: String, window: &ApplicationWindow) {
     //println!("Input HTML:\n{}", html);
@@ -38,14 +37,14 @@ pub fn render(html: String, window: &ApplicationWindow) {
 
     // js
     let js = get_js_content(dom_root.clone());
-    let lexer = Lexer::new(js);
+    let lexer = JsLexer::new(js);
     //println!("JS lexer {:?}", lexer);
 
-    let mut parser = Parser::new(lexer);
+    let mut parser = JsParser::new(lexer);
     let ast = parser.parse_ast();
     //println!("JS ast {:?}", ast);
 
-    let mut runtime = Runtime::new();
+    let mut runtime = JsRuntime::new();
     runtime.execute(&ast);
 
     // apply css to html and create RenderTree

app/browser-rs/src/renderer/mod.rs

@@ -2,7 +2,7 @@
 //! https://astexplorer.net/
 
 use crate::alloc::string::ToString;
-use crate::token::{Lexer, Token};
+use crate::token::{JsLexer, Token};
 use alloc::rc::Rc;
 use alloc::string::String;
 use alloc::vec::Vec;
@@ -137,13 +137,13 @@ impl Node {
     }
 }
 
-pub struct Parser {
-    t: Lexer,
+pub struct JsParser {
+    t: JsLexer,
 }
 
 #[allow(dead_code)]
-impl Parser {
-    pub fn new(t: Lexer) -> Self {
+impl JsParser {
+    pub fn new(t: JsLexer) -> Self {
         Self { t }
     }
 

app/saji/src/ast.rs

@@ -9,9 +9,9 @@ mod token;
 extern crate alloc;
 
 use crate::alloc::string::ToString;
-use crate::ast::Parser;
-use crate::runtime::Runtime;
-use crate::token::Lexer;
+use crate::ast::JsParser;
+use crate::runtime::JsRuntime;
+use crate::token::JsLexer;
 use liumlib::*;
 
 entry_point!(main);
@@ -22,13 +22,13 @@ fn main() {
         exit(0);
     }
 
-    let lexer = Lexer::new(args[1].to_string());
+    let lexer = JsLexer::new(args[1].to_string());
     println!("lexer {:?}", lexer);
 
-    let mut parser = Parser::new(lexer);
+    let mut parser = JsParser::new(lexer);
     let ast = parser.parse_ast();
     println!("ast {:?}", ast);
 
-    let mut runtime = Runtime::new();
+    let mut runtime = JsRuntime::new();
     runtime.execute(&ast);
 }

app/saji/src/main.rs

@@ -7,7 +7,7 @@ use alloc::string::String;
 use alloc::vec::Vec;
 use core::borrow::Borrow;
 use core::cell::RefCell;
-use hashbrown::hash_map::Entry;
+//use hashbrown::hash_map::Entry;
 use hashbrown::HashMap;
 #[allow(unused_imports)]
 use liumlib::*;
@@ -61,6 +61,7 @@ impl Environment {
         self.variables.insert(name, value);
     }
 
+    /*
     fn assign_variable(&mut self, name: String, value: Option<RuntimeValue>) {
         let entry = self.variables.entry(name.clone());
         match entry {
@@ -76,6 +77,7 @@ impl Environment {
             }
         }
     }
+    */
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -92,13 +94,13 @@ impl Function {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Runtime {
+pub struct JsRuntime {
     pub global_variables: HashMap<String, Option<RuntimeValue>>,
     pub functions: Vec<Function>,
     pub env: Rc<RefCell<Environment>>,
 }
 
-impl Runtime {
+impl JsRuntime {
     pub fn new() -> Self {
         Self {
             global_variables: HashMap::new(),

app/saji/src/runtime.rs

@@ -24,13 +24,13 @@ pub enum Token {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Lexer {
+pub struct JsLexer {
     pos: usize,
     input: Vec<char>,
 }
 
 #[allow(dead_code)]
-impl Lexer {
+impl JsLexer {
     pub fn new(js: String) -> Self {
         Self {
             pos: 0,
@@ -175,7 +175,7 @@ impl Lexer {
     }
 }
 
-impl Iterator for Lexer {
+impl Iterator for JsLexer {
     type Item = Token;
 
     fn next(&mut self) -> Option<Self::Item> {