Merge branch 'sauppb:main' into main

JMU-CS · Aug 2, 2023 · 51d8336 · 51d8336
2 parents e994666 + fb7f32c
commit 51d8336
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -284,7 +284,7 @@
 </head>
 <body>
   <header class="nav-bar">
-    <h1>Praxly beta 0.0</h1>
+    <h1>Praxly beta</h1>
     <div id="myModal" class="modal">
 
       <!-- Modal content -->

diff --git a/public/style.css b/public/style.css
@@ -1,8 +1,12 @@
 
+h1 {
+  font-family: sans-serif;
+}
 
 body {
     display: flex;
     flex-direction: column;
+    margin: 0;
 
 }
 
@@ -11,6 +15,7 @@ body {
     background: #d9dbda;
     margin: 10px;
     height: 10vh;
+    padding: 10px;
 }
 
 main {

diff --git a/src/ast.js b/src/ast.js
@@ -688,12 +688,12 @@ class Praxly_codeBlock {
           const element = this.praxly_blocks[i];
 
           //aborts if it detects a return statement. Hopefully this doesn't cause problems later ahaha
-          if (element?.isreturn) {
-            return element.evaluate(environment);       
-        } else {
-            element.evaluate(environment);
-        }
-        }
+              if (element?.isreturn) {
+                return element.evaluate(environment);       
+            } else {
+                element.evaluate(environment);
+            }
+        } 
 
         return "Exit_Success";
       }

diff --git a/src/lexer-parser.js b/src/lexer-parser.js
@@ -1319,8 +1319,8 @@ statement() {
   else {
     // console.log(`the current token is ${this.tokens[this.i].token_type} and the next one is ${this.tokens[this.i + 1].token_type}`)
     let contents = this.boolean_operation();
-    if (contents === undefined){
-      contents = null;
+    if (contents === undefined || contents === null){
+      return;
     }
     if (this.has(';')){
       this.advance();

diff --git a/src/tree2text.js b/src/tree2text.js
@@ -58,7 +58,7 @@ export const tree2text = (blockjson, startIndex, indentation) => {
             }
         case 'COMMENT':
             try {
-                var result = '/*' + blockjson.value + '*/';
+                var result = '/*' + blockjson.value + '*/\n';
                 blockjson.startIndex = startIndex;
                 blockjson.endIndex = startIndex + result.length;
                 blockjson.beg = startIndex;
@@ -71,7 +71,7 @@ export const tree2text = (blockjson, startIndex, indentation) => {
             }
         case 'SINGLE_LINE_COMMENT':
             try {
-                var result = '// ' + blockjson.value;
+                var result = '// ' + blockjson.value + '\n';
                 blockjson.startIndex = startIndex;
                 blockjson.endIndex = startIndex + result.length;
                 blockjson.beg = startIndex;