From 387959675cd53b3c75ad9b6215b07843f8c8f1d8 Mon Sep 17 00:00:00 2001 From: Greg Brown Date: Tue, 11 May 2021 13:53:56 +0100 Subject: Rename autochomp to autonibble. --- autochomp/benches/parse/data/12.nb | 1 - autochomp/benches/parse/data/1548.nb | 40 ------------------ autochomp/benches/parse/data/194.nb | 7 --- autochomp/benches/parse/data/24.nb | 1 - autochomp/benches/parse/data/3096.nb | 82 ------------------------------------ autochomp/benches/parse/data/387.nb | 13 ------ autochomp/benches/parse/data/48.nb | 2 - autochomp/benches/parse/data/774.nb | 21 --------- autochomp/benches/parse/data/97.nb | 3 -- autochomp/benches/parse/main.rs | 64 ---------------------------- 10 files changed, 234 deletions(-) delete mode 100644 autochomp/benches/parse/data/12.nb delete mode 100644 autochomp/benches/parse/data/1548.nb delete mode 100644 autochomp/benches/parse/data/194.nb delete mode 100644 autochomp/benches/parse/data/24.nb delete mode 100644 autochomp/benches/parse/data/3096.nb delete mode 100644 autochomp/benches/parse/data/387.nb delete mode 100644 autochomp/benches/parse/data/48.nb delete mode 100644 autochomp/benches/parse/data/774.nb delete mode 100644 autochomp/benches/parse/data/97.nb delete mode 100644 autochomp/benches/parse/main.rs (limited to 'autochomp/benches/parse') diff --git a/autochomp/benches/parse/data/12.nb b/autochomp/benches/parse/data/12.nb deleted file mode 100644 index eaa4670..0000000 --- a/autochomp/benches/parse/data/12.nb +++ /dev/null @@ -1 +0,0 @@ -match "ab"; diff --git a/autochomp/benches/parse/data/1548.nb b/autochomp/benches/parse/data/1548.nb deleted file mode 100644 index cabdfe9..0000000 --- a/autochomp/benches/parse/data/1548.nb +++ /dev/null @@ -1,40 +0,0 @@ -let bot = !(/rec/ "a" . rec); -let zero = /zero suc/ zero; -let suc n = /zero suc/ suc (n zero suc); - -let opt some = _ : None | some; -let plus iter = !(/plus/ iter . (opt plus)); -let star iter = opt (plus iter); - -let up_to x n = n bot (/rec/ x . opt rec); - -let Pattern_Whitespace = "\t"|"\n"|"\x0B"|"\x0c"|"\r"|" "|"\u{85}"|"\u{200e}"|"\u{200f}"|"\u{2028}"|"\u{2029}"; - -let oct_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" ; -let digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"; -let hex_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | - "a" | "b" | "c" | "d" | "e" | "f" | - "A" | "B" | "C" | "D" | "E" | "F" ; - -let XID_Start = - "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | - "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | - "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | - "y" | "z" | - "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | - "I" | "J" | "K" | "L" | "M" | "N" | "O" | "P" | - "Q" | "R" | "S" | "T" | "U" | "V" | "W" | "X" | - "Y" | "Z" ; -let XID_Continue = - XID_Start | "_" | "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ; - -match - (" " | "!" | "#" | "$" | "%" | "&" | "'" | - "(" | ")" | "*" | "+" | "," | "-" | "." | "/" | - "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | - "8" | "9" | ":" | ";" | "<" | "=" | ">" | "?" | - "@" | "A" | "B" | "C" | "D" | "E" | "F" | "G" | - "H" | "I" | "J" | "K" | "L" | "M" | "N" | "O" | - "P" | "Q" | "R" | "S" | "T" | "U" | "V" | "W" | - "X"|"Y" - ); diff --git a/autochomp/benches/parse/data/194.nb b/autochomp/benches/parse/data/194.nb deleted file mode 100644 index 01730c6..0000000 --- a/autochomp/benches/parse/data/194.nb +++ /dev/null @@ -1,7 +0,0 @@ -let bot = !(/rec/ "a" . rec); -let zero = /zero suc/ zero; -let suc n = /zero suc/ suc (n zero suc); - -let opt some = _ : None | some; -let plus iter = !(/plus/ iter . (opt plus)); -match opt "ab"; diff --git a/autochomp/benches/parse/data/24.nb b/autochomp/benches/parse/data/24.nb deleted file mode 100644 index f960c3b..0000000 --- a/autochomp/benches/parse/data/24.nb +++ /dev/null @@ -1 +0,0 @@ -match !(/rec/ "a".rec); diff --git a/autochomp/benches/parse/data/3096.nb b/autochomp/benches/parse/data/3096.nb deleted file mode 100644 index f90100c..0000000 --- a/autochomp/benches/parse/data/3096.nb +++ /dev/null @@ -1,82 +0,0 @@ -let bot = !(/rec/ "a" . rec); -let zero = /zero suc/ zero; -let suc n = /zero suc/ suc (n zero suc); - -let opt some = _ : None | some; -let plus iter = !(/plus/ iter . (opt plus)); -let star iter = opt (plus iter); - -let up_to x n = n bot (/rec/ x . opt rec); - -let Pattern_Whitespace = "\t"|"\n"|"\x0B"|"\x0c"|"\r"|" "|"\u{85}"|"\u{200e}"|"\u{200f}"|"\u{2028}"|"\u{2029}"; - -let oct_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" ; -let digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"; -let hex_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | - "a" | "b" | "c" | "d" | "e" | "f" | - "A" | "B" | "C" | "D" | "E" | "F" ; - -let XID_Start = - "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | - "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | - "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | - "y" | "z" | - "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | - "I" | "J" | "K" | "L" | "M" | "N" | "O" | "P" | - "Q" | "R" | "S" | "T" | "U" | "V" | "W" | "X" | - "Y" | "Z" ; -let XID_Continue = - XID_Start | "_" | "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ; - -let literal_char = - (" " | "!" | "#" | "$" | "%" | "&" | "'" | - "(" | ")" | "*" | "+" | "," | "-" | "." | "/" | - "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | - "8" | "9" | ":" | ";" | "<" | "=" | ">" | "?" | - "@" | "A" | "B" | "C" | "D" | "E" | "F" | "G" | - "H" | "I" | "J" | "K" | "L" | "M" | "N" | "O" | - "P" | "Q" | "R" | "S" | "T" | "U" | "V" | "W" | - "X" | "Y" | "Z" | "[" | "]" | "^" | "_" | - "`" | "a" | "b" | "c" | "d" | "e" | "f" | "g" | - "h" | "i" | "j" | "k" | "l" | "m" | "n" | "o" | - "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | - "x" | "y" | "z" | "{" | "|" | "}" | "~") : Literal | - "\\" . ( - ("\"" | "'" | "n" | "r" | "t" | "\\" | "0") : Ascii | - "x" . oct_digit . hex_digit : Oct | - "u{" . up_to hex_digit (suc (suc (suc (suc (suc (suc zero)))))) . "}" : Unicode - ) : Escape ; - -let ws = plus Pattern_Whitespace; -let ows = opt ws; - -let list inner = !(/list/ inner . opt (ws . opt list)); -let separated inner sep = !(/separated/ inner . opt (sep . ows . separated)); - -let epsilon = "_"; -let ident = XID_Start . star XID_Continue; -let literal = "\"" . (plus literal_char : Contents) . "\""; -let fix term = "!" . ows . term; -let parens expr = "(" . ows . expr . ")"; - -let names = list ident; - -let term expr = !(/term/ - epsilon : Epsilon - | literal : Literal - | parens expr : Parens - | fix term : Fix - | ident : Variable - ); - -let label = ":" . ows . ident . ows; - -let call expr = list (term expr); -let cat expr = separated (call expr) "."; -let alt expr = separated (cat expr . opt label : Labelled) "|"; -let lambda expr = "/" . ows . names . "/" . ows . alt expr; -let expr = !(/expr/ alt expr | lambda expr); -let goal = "match" . ws . expr . ";" . ows; -let let stmt = "let" . ws . names . "=" . ows . expr . ";" . ows . stmt; -let stmt = !(/stmt/ let stmt | goal); -match !(/skip/ Pattern_Whitespace . skip | stmt); diff --git a/autochomp/benches/parse/data/387.nb b/autochomp/benches/parse/data/387.nb deleted file mode 100644 index 0f60b89..0000000 --- a/autochomp/benches/parse/data/387.nb +++ /dev/null @@ -1,13 +0,0 @@ -let bot = !(/rec/ "a" . rec); -let zero = /zero suc/ zero; -let suc n = /zero suc/ suc (n zero suc); - -let opt some = _ : None | some; -let plus iter = !(/plus/ iter . (opt plus)); -let star iter = opt (plus iter); - -let up_to x n = n bot (/rec/ x . opt rec); - -let Pattern_Whitespace = "\t"|"\n"|"\x0B"|"\x0c"|"\r"|" "|"\u{85}"|"\u{200e}"|"\u{200f}"|"\u{2028}"|"\u{2029}"; - -match = "0" |"1"; diff --git a/autochomp/benches/parse/data/48.nb b/autochomp/benches/parse/data/48.nb deleted file mode 100644 index 7059bb8..0000000 --- a/autochomp/benches/parse/data/48.nb +++ /dev/null @@ -1,2 +0,0 @@ -let bot = !(/rec/ "a" . rec); -match /zero/zero; diff --git a/autochomp/benches/parse/data/774.nb b/autochomp/benches/parse/data/774.nb deleted file mode 100644 index 89c22ca..0000000 --- a/autochomp/benches/parse/data/774.nb +++ /dev/null @@ -1,21 +0,0 @@ -let bot = !(/rec/ "a" . rec); -let zero = /zero suc/ zero; -let suc n = /zero suc/ suc (n zero suc); - -let opt some = _ : None | some; -let plus iter = !(/plus/ iter . (opt plus)); -let star iter = opt (plus iter); - -let up_to x n = n bot (/rec/ x . opt rec); - -let Pattern_Whitespace = "\t"|"\n"|"\x0B"|"\x0c"|"\r"|" "|"\u{85}"|"\u{200e}"|"\u{200f}"|"\u{2028}"|"\u{2029}"; - -let oct_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" ; -let digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"; -let hex_digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | - "a" | "b" | "c" | "d" | "e" | "f" | - "A" | "B" | "C" | "D" | "E" | "F" ; - -match - "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | - "i" | "j" | "k" | "l"; diff --git a/autochomp/benches/parse/data/97.nb b/autochomp/benches/parse/data/97.nb deleted file mode 100644 index d0d00f9..0000000 --- a/autochomp/benches/parse/data/97.nb +++ /dev/null @@ -1,3 +0,0 @@ -let bot = !(/rec/ ("a" . rec)); -let zero = /zero suc/ zero; -match (/zero suc/ suc (_ zero suc)); diff --git a/autochomp/benches/parse/main.rs b/autochomp/benches/parse/main.rs deleted file mode 100644 index 64fd88a..0000000 --- a/autochomp/benches/parse/main.rs +++ /dev/null @@ -1,64 +0,0 @@ -use std::error::Error; - -use chewed::{IterWrapper, Parser}; -use chomp::{ - chomp::ast::NamedExpression, - nibble::{ - self, - convert::{Context, Convert}, - }, -}; -use criterion::{ - criterion_group, criterion_main, AxisScale, BenchmarkId, Criterion, PlotConfiguration, - Throughput, -}; - -const INPUTS: &[&str] = &[ - include_str!("data/12.nb"), - include_str!("data/24.nb"), - include_str!("data/48.nb"), - include_str!("data/97.nb"), - include_str!("data/194.nb"), - include_str!("data/387.nb"), - include_str!("data/774.nb"), - include_str!("data/1548.nb"), - include_str!("data/3096.nb"), - -]; - -fn parse_autochomp(input: &str) -> Result> { - IterWrapper::new(input.chars()) - .parse::() - .map_err(|e| Box::new(e) as Box) - .and_then(|ast| { - ast.convert(&mut Context::default()) - .map_err(|e| Box::new(e) as Box) - }) -} - -fn parse_chomp(input: &str) -> Result> { - syn::parse_str::(input) - .map_err(|e| Box::new(e) as Box) - .and_then(|stmt| { - stmt.convert(&mut Context::default()) - .map_err(|e| Box::new(e) as Box) - }) -} - -fn bench_parse(c: &mut Criterion) { - let plot_config = PlotConfiguration::default().summary_scale(AxisScale::Logarithmic); - let mut group = c.benchmark_group("Parse"); - group.plot_config(plot_config); - for (i, input) in INPUTS.iter().enumerate() { - group.throughput(Throughput::Bytes(input.len() as u64)); - group.bench_with_input(BenchmarkId::new("Chomp", i), *input, |b, i| { - b.iter(|| parse_chomp(i)) - }); - group.bench_with_input(BenchmarkId::new("AutoChomp", i), *input, |b, i| { - b.iter(|| parse_autochomp(i)) - }); - } -} - -criterion_group!(benches, bench_parse); -criterion_main!(benches); -- cgit v1.2.3