up

nikeedev · Dec 6, 2023 · d2f2ba3 · d2f2ba3
1 parent 4536e54
commit d2f2ba3
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 13 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/rain-lang.iml b/.idea/rain-lang.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/main.rs b/src/main.rs
@@ -30,14 +30,13 @@ fn main() {
 	let tokens = lexer.tokens;
 
 	for token in tokens {
-		println!("{:#?}", token);
+		// println!("{:#?}", token);
 	}
 
-	// let idents: Vec<Token> = lexer.idents;
+	let idents = lexer.idents;
 
-	// for ident in &idents {
-	// 	println!("{:#?}", ident);
-	// }
+	for ident in &idents {
+		println!("{:#?}", ident);
+	}
 
-	// lex(src_raw)
 }
diff --git a/src/rain/mod.rs b/src/rain/mod.rs
@@ -9,13 +9,12 @@ pub enum TokenType {
     Comment, // //
     String { is_terminated: bool },
 
-    Dot, // for getting variables and functions out of structs or,
-    // defining a float
+    Dot, // 0.0f (floats), struct.name (for getting properties or doing function calls from something)
     Function, // () {}
     Ident,    // x : =
-    If,
-    Else,
-    For,
+    If, // if
+    Else, // else / else if
+    For, // for
 
     Plus,  // +
     Minus, // -
@@ -172,12 +171,18 @@ impl<'a> Lexer<'a> {
             ',' => TokenType::Comma,
 
             '>' => match self.peek() {
-                '=' => TokenType::EqualsGreaterThan, // >=
+                '=' => {
+					self.bump();
+					TokenType::EqualsGreaterThan // >=
+				},
                 _ => TokenType::GreaterThan,         // >
             },
 
             '<' => match self.peek() {
-                '=' => TokenType::EqualsLessThan, // <=
+                '=' => {
+					self.bump();
+					TokenType::EqualsLessThan // <=
+				},
                 _ => TokenType::LessThan,         // <
             },