lexer fix

DecklynKern · Jul 30, 2024 · da9dc01 · da9dc01
1 parent 688e50c
commit da9dc01
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/src/elaborate.rs b/src/elaborate.rs
@@ -105,8 +105,8 @@ pub enum ElaboratedDataType {
     GenericString,
     Stack(Box<ElaboratedDataType>, usize),
     UserEnum(usize),
-    UserStruct(usize)
-    //Array(Rc<DataType>, usize)
+    UserStruct(usize),
+    Array(Box<ElaboratedDataType>, usize)
 }
 
 impl ElaboratedDataType {
@@ -146,7 +146,7 @@ impl ElaboratedDataType {
             Self::Stack(data_type, len) => (len + 1) * (data_type.get_size(user_definitions) + 1) + 1,
             Self::UserEnum(_) => 1,
             Self::UserStruct(struct_id) => user_definitions.structs[*struct_id].size,
-            //Self::Array(data_type, len) => data_type.get_size() * len
+            Self::Array(data_type, len) => data_type.get_size(user_definitions) * len,
             Self::GenericNumber | Self::GenericString => unreachable!()
         }
     }

diff --git a/src/lex.rs b/src/lex.rs
@@ -309,8 +309,15 @@ fn try_lex_symbol(chars: &mut Peekable<Chars>) -> Result<Option<Token>, ()> {
         symbol_chars.push(*char);
 
         if symbol_chars == "//" {
-            chars.for_each(drop);
+
+            while let Some(char) = chars.next() {
+                if char == '\n' {
+                    return Ok(Some(Token::Comment));
+                }
+            }
+
             return Ok(Some(Token::Comment));
+
         }
 
         if let Some(symbol) = Token::try_parse_symbol(&symbol_chars) {

diff --git a/src/parse.rs b/src/parse.rs
@@ -732,20 +732,27 @@ impl<'a> Parser<'a> {
 
         while let Some(&token) = self.tokens.peek() {
 
-            if *token == Token::End {
-                self.tokens.next();
-                break;
-            }
-
-            // hacky
-            if *token == Token::Else {
-                break;
-            }
+            match token {
+                Token::Newline => {
+                    self.tokens.next();
+                    continue;
+                }
+                Token::End => {
+                    self.tokens.next();
+                    break;
+                }
+                // hacky
+                Token::Else => {
+                    break;
+                }
+                _ => {
 
-            statements.push(self.parse_statement()?);
+                    statements.push(self.parse_statement()?);
 
-            if !self.tokens.is_empty() {
-                self.expect_newline()?;
+                    if !self.tokens.is_empty() {
+                        self.expect_newline()?;
+                    }
+                }
             }
         }