SWIM-ucf · ehraiford · Jan 26, 2023 · Jan 11, 2023 · Jan 11, 2023 · Jan 14, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/emulation_core/mips/memory.rs b/src/emulation_core/mips/memory.rs
@@ -20,7 +20,7 @@ impl ToString for Memory {
         let mut output = String::new();
 
         for byte in self.memory.iter() {
-            output.push_str(&format!("{:x}", byte));
+            output.push_str(&format!("{byte:x}"));
         }
 
         output
@@ -33,7 +33,7 @@ impl Memory {
     /// the address.
     fn check_valid_address(&self, address: usize) -> Result<(), String> {
         if address % 4 != 0 {
-            Err(format!("Address `{}` is not word-aligned", address))
+            Err(format!("Address `{address}` is not word-aligned"))
         } else if address > self.memory.len() {
             Err(format!(
                 "Address `{}` out of bounds of memory of size {}",

diff --git a/src/emulation_core/mips/registers.rs b/src/emulation_core/mips/registers.rs
@@ -62,7 +62,7 @@ impl ToString for GpRegisters {
             .gpr
             .iter()
             .enumerate()
-            .map(|(i, inst)| format!("gpr[{}] = {}", i, inst))
+            .map(|(i, inst)| format!("gpr[{i}] = {inst}"))
             .collect::<Vec<String>>()
             .join("\n");
         output.push_str(&gpr_registers);
@@ -79,7 +79,7 @@ impl Index<&str> for GpRegisters {
     fn index(&self, index: &str) -> &Self::Output {
         match GpRegisterType::from_str(index) {
             Ok(register) => &self[register],
-            _ => panic!("{} is not a valid register", index),
+            _ => panic!("{index} is not a valid register"),
         }
     }
 }
@@ -90,7 +90,7 @@ impl IndexMut<&str> for GpRegisters {
     fn index_mut(&mut self, index: &str) -> &mut Self::Output {
         match GpRegisterType::from_str(index) {
             Ok(register) => &mut self[register],
-            _ => panic!("{} is not a valid register", index),
+            _ => panic!("{index} is not a valid register"),
         }
     }
 }

diff --git a/src/main.rs b/src/main.rs
@@ -2,6 +2,7 @@ pub mod emulation_core;
 pub mod parser;
 #[cfg(test)]
 pub mod tests;
+pub mod ui;
 
 use emulation_core::datapath::Datapath;
 use emulation_core::mips::datapath::MipsDatapath;
@@ -14,8 +15,17 @@ use monaco::{
 use parser::parser_main::parser;
 use std::{cell::RefCell, rc::Rc};
 use stylist::css;
+//use stylist::yew::*;
+use ui::console::component::Console;
+use ui::regview::component::Regview;
 use wasm_bindgen::JsValue;
 use yew::prelude::*;
+use yew::{html, Html, Properties};
+
+#[derive(Properties, PartialEq)]
+pub struct Consoleprops {
+    pub parsermsg: String,
+}
 
 #[function_component(App)]
 fn app() -> Html {
@@ -30,6 +40,8 @@ fn app() -> Html {
     let text_model =
         use_state_eq(|| TextModel::create(&default_code, Some(&language), None).unwrap());
 
+    let parser_text_output = use_state_eq(String::new);
+
     // TODO: Output will be stored in two ways, the first would be the parser's
     // messages via logs and the registers will be stored
     // in a custom-built register viewer.
@@ -81,12 +93,39 @@ fn app() -> Html {
         )
     };
 
+    let on_reset_clicked = {
+        let datapath = Rc::clone(&datapath);
+        use_callback(
+            move |_, _| {
+                let mut datapath = (*datapath).borrow_mut();
+                (*datapath).reset();
+                log!(JsValue::from_str(&datapath.registers.to_string()));
+            },
+            (),
+        )
+    };
+
+    let on_error_clicked = {
+            let parser_text_output = parser_text_output.clone();
+        use_callback(
+            move |_, _| {
+                parser_text_output.set("Arial".to_string());
+            },
+            (),
+        )
+    };
+
     html! {
         <div>
             <h1>{"Welcome to SWIM"}</h1>
             <button  "Assemble" }</button>
             <button  { "Execute" }</button>
+            <button  "Reset" }</button>
+            // Pass in register data from emu core
+            <Regview gp={(*datapath).borrow().registers}/>
             <SwimEditor text_model={(*text_model).clone()} />
+            <button  "Click" }</button>
+            <Console parsermsg={(*parser_text_output).clone()}/>
         </div>
     }
 }

diff --git a/src/parser/parser_structs_and_enums.rs b/src/parser/parser_structs_and_enums.rs
@@ -89,7 +89,7 @@ pub mod instruction_tokenization {
         println!("Int representation: {}", instruction.binary);
 
         for error in &instruction.errors {
-            print!("{:?}", error);
+            print!("{error:?}");
             if error.operand_number.is_some() {
                 println!(" on operand {}.", error.operand_number.unwrap());
             } else {

diff --git a/src/ui.rs b/src/ui.rs
@@ -0,0 +1,4 @@
+//! User interface using Yew, organized into components.
+
+pub mod console;
+pub mod regview;
diff --git a/src/ui/console/component.rs b/src/ui/console/component.rs
@@ -0,0 +1,19 @@
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct Consoleprops {
+    pub parsermsg: String,
+}
+
+#[function_component(Console)]
+pub fn console(props: &Consoleprops) -> Html {
+    html! {
+        <>
+            // <div style="width: 80.4%; height: 17vh; border: 1px solid black;"></div>
+            <div style="width: 80.4%; height: 17vh; border: 2px solid black; background-color: #b9cceb; color: #000000;">
+                <p>{ props.parsermsg.clone() }</p>
+                //<p>{ ">" }</p>
+            </div>
+        </>
+    }
+}
diff --git a/src/ui/console/mod.rs b/src/ui/console/mod.rs
@@ -0,0 +1 @@
+pub mod component;
diff --git a/src/ui/regview/component.rs b/src/ui/regview/component.rs
@@ -0,0 +1,42 @@
+use yew::prelude::*;
+
+use crate::emulation_core::mips::registers::GpRegisters;
+
+#[derive(Properties, PartialEq)]
+pub struct Regviewprops {
+    pub gp: GpRegisters,
+}
+
+//Convert register to html through iterator
+pub fn gen_reg_html(gp: GpRegisters) -> Html {
+    gp.into_iter()
+        .map(|(register, data)| {
+            html! {
+                <tr style="border: 1px solid black;">
+                    <td style="border: 1px solid black;">
+                        {register}
+                    </td>
+                    <td style="border: 1px solid black;">
+                        {data.to_string()}
+                    </td>
+                </tr>
+            }
+        })
+        .collect::<Html>()
+}
+#[function_component(Regview)]
+pub fn regview(props: &Regviewprops) -> Html {
+    html! {
+        <>
+            <div>
+                <table style="width: 19.2%; height: 97vh; border: 1px solid black; background-color: white; float: right;" content="width=device-width; initial-scale=1.0">
+                    <tr style="border: 1px solid black;">
+                        <th style="border: 1px solid black;">{"Register Name"}</th>
+                        <th style="border: 1px solid black;">{"Data"}</th>
+                    </tr>
+                    {gen_reg_html(props.gp)}
+                </table>
+            </div>
+        </>
+    }
+}
diff --git a/src/ui/regview/labelcont.rs b/src/ui/regview/labelcont.rs
diff --git a/src/ui/regview/mod.rs b/src/ui/regview/mod.rs
@@ -0,0 +1 @@
+pub mod component;
diff --git a/src/ui/regview/tabs.rs b/src/ui/regview/tabs.rs
diff --git a/src/ui/regview/value.rs b/src/ui/regview/value.rs