upgrade logos version

Author: sdiehl

coc/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 lalrpop-util = { version = "0.22.2", features = ["lexer", "unicode"] }
-logos = "0.15.1"
+logos = "0.16"
 ariadne = "0.6"
 thiserror = "2.0"
 

coc/src/lexer.rs

@@ -97,7 +97,7 @@ pub enum Token {
     #[regex(r"[0-9]+", |lex| lex.slice().parse::<i64>().ok())]
     Number(Option<i64>),
 
-    #[regex(r#""([^"\\]|\\.)*""#, |lex| {
+    #[regex(r#""([^"\\]|\\.)*?""#, |lex| {
         let s = lex.slice();
         s[1..s.len()-1].to_owned()
     })]
@@ -111,8 +111,8 @@ pub enum Token {
 
     // Whitespace and comments
     #[regex(r"[ \t\n\f]+", logos::skip)]
-    #[regex(r"--[^\n\r]*", logos::skip)]
-    #[regex(r"/\*([^*]|\*+[^*/])*\*+/", logos::skip)]
+    #[regex(r"--[^\n\r]*", logos::skip, allow_greedy = true)]
+    #[regex(r"/\*([^*]|\*+[^*/])*?\*+/", logos::skip)]
     Whitespace,
 }
 

system-f-omega/Cargo.toml

@@ -12,7 +12,7 @@ codegen = ["dep:cranelift", "dep:cranelift-module", "dep:cranelift-object", "dep
 
 [dependencies]
 lalrpop-util = { version = "0.22.2", features = ["lexer", "unicode"] }
-logos = "0.15"
+logos = "0.16"
 thiserror = "2.0"
 ariadne = "0.6"
 clap = { version = "4.0", features = ["derive"] }

system-f-omega/src/lexer.rs

@@ -92,7 +92,7 @@ pub enum Token {
 
     // Skip whitespace and comments
     #[regex(r"[ \t\f]+", logos::skip)]
-    #[regex(r"--[^\r\n]*", logos::skip)]
+    #[regex(r"--[^\r\n]*", logos::skip, allow_greedy = true)]
     #[token("\r\n", |_| Token::Newline)]
     #[token("\n", |_| Token::Newline)]
     Error,