Merge pull request #26 from gwenn/rm_buf_redux

Drop support of buf_redux / streaming input

Cargo.toml

@@ -22,15 +22,14 @@ YYNOERRORRECOVERY = []
 YYSTACKDYNAMIC = []
 YYCOVERAGE = []
 NDEBUG = []
-default = ["YYNOERRORRECOVERY", "buf_redux"]
+default = ["YYNOERRORRECOVERY"]
 
 [dependencies]
 phf = { version = "0.11", features = ["uncased"] }
 log = "0.4"
 memchr = "2.0"
 fallible-iterator = "0.2"
 smallvec = ">=1.6.1"
-buf_redux = { version = "0.8", optional = true }
 bitflags = "2.0"
 uncased = "0.9"
 indexmap = "1.9"

examples/sql_check.rs

@@ -1,10 +1,9 @@
 use fallible_iterator::FallibleIterator;
 use std::env;
-use std::fs::File;
+use std::fs::read;
 use std::panic;
 
 use sqlite3_parser::lexer::sql::Parser;
-use sqlite3_parser::lexer::InputStream;
 
 /// Parse specified files and check all commands.
 fn main() {
@@ -13,9 +12,8 @@ fn main() {
     for arg in args.skip(1) {
         println!("{arg}");
         let result = panic::catch_unwind(|| {
-            let f = File::open(arg.clone()).unwrap();
-            let input = InputStream::new(f);
-            let mut parser = Parser::new(input);
+            let input = read(arg.clone()).unwrap();
+            let mut parser = Parser::new(&input);
             loop {
                 match parser.next() {
                     Ok(None) => break,

examples/sql_cmds.rs

@@ -1,10 +1,9 @@
 use fallible_iterator::FallibleIterator;
 use std::env;
-use std::fs::File;
+use std::fs::read;
 use std::panic;
 
 use sqlite3_parser::lexer::sql::Parser;
-use sqlite3_parser::lexer::InputStream;
 
 /// Parse specified files and print all commands.
 fn main() {
@@ -13,9 +12,8 @@ fn main() {
     for arg in args.skip(1) {
         println!("{arg}");
         let result = panic::catch_unwind(|| {
-            let f = File::open(arg.clone()).unwrap();
-            let input = InputStream::new(f);
-            let mut parser = Parser::new(input);
+            let input = read(arg.clone()).unwrap();
+            let mut parser = Parser::new(input.as_ref());
             loop {
                 match parser.next() {
                     Ok(None) => break,

examples/sql_tokens.rs

@@ -1,8 +1,8 @@
 use sqlite3_parser::lexer::sql::{TokenType, Tokenizer};
-use sqlite3_parser::lexer::{InputStream, Scanner};
+use sqlite3_parser::lexer::Scanner;
 
 use std::env;
-use std::fs::File;
+use std::fs::read;
 use std::i64;
 use std::str;
 
@@ -11,12 +11,11 @@ fn main() {
     use TokenType::*;
     let args = env::args();
     for arg in args.skip(1) {
-        let f = File::open(arg.clone()).unwrap();
-        let input = InputStream::new(f);
+        let input = read(arg.clone()).unwrap();
         let tokenizer = Tokenizer::new();
-        let mut s = Scanner::new(input, tokenizer);
+        let mut s = Scanner::new(tokenizer);
         loop {
-            match s.scan() {
+            match s.scan(&input) {
                 Ok(None) => break,
                 Err(err) => {
                     //eprintln!("{} at line: {}, column: {}", err, s.line(), s.column());

src/lexer/mod.rs

@@ -3,6 +3,4 @@
 mod scan;
 pub mod sql;
 
-#[cfg(feature = "buf_redux")]
-pub use scan::InputStream;
-pub use scan::{Input, ScanError, Scanner, Splitter};
+pub use scan::{ScanError, Scanner, Splitter};