From 8a48212d7c1ac874aea83aeefe919adc169a61da Mon Sep 17 00:00:00 2001 From: vms Date: Fri, 5 Mar 2021 16:59:35 +0300 Subject: [PATCH] move to the original lalrpop parser (#73) --- Cargo.lock | 139 +++------ crates/air-parser/Cargo.toml | 6 +- crates/air-parser/src/parser/air.rs | 457 ++++++++++++++-------------- crates/polyplets/Cargo.toml | 2 +- 4 files changed, 280 insertions(+), 324 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d7b2de1..c0031297 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" version = "0.7.15" @@ -211,27 +213,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.3", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "boolinator" version = "2.4.0" @@ -256,12 +237,6 @@ version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.4.2" @@ -487,6 +462,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-mac" version = "0.8.0" @@ -547,7 +528,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -570,18 +551,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "docopt" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -dependencies = [ - "lazy_static", - "regex", - "serde", - "strsim", -] - [[package]] name = "either" version = "1.6.1" @@ -640,12 +609,6 @@ dependencies = [ "libc", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fce" version = "0.3.0" @@ -903,9 +866,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] @@ -995,9 +958,9 @@ dependencies = [ [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "humantime" @@ -1135,32 +1098,32 @@ dependencies = [ [[package]] name = "lalrpop" -version = "0.19.1" -source = "git+https://github.com/fluencelabs/lalrpop?branch=cloneable_parser#486546b479b51ee370beec1d9e663dcbafa7cab1" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46962a8c71b91c3524b117dfdd70844d4265a173c4c9109f98171aebdcf1195f" dependencies = [ "ascii-canvas", "atty", "bit-set", "diff", - "docopt", "ena", - "itertools 0.9.0", + "itertools 0.10.0", "lalrpop-util", "petgraph", + "pico-args", "regex", "regex-syntax", - "serde", - "serde_derive", - "sha2", "string_cache", "term", + "tiny-keccak", "unicode-xid", ] [[package]] name = "lalrpop-util" -version = "0.19.1" -source = "git+https://github.com/fluencelabs/lalrpop?branch=cloneable_parser#486546b479b51ee370beec1d9e663dcbafa7cab1" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a708007b751af124d09e9c5d97515257902bc6b486a56b40bcafd939e8ff467" dependencies = [ "regex", ] @@ -1192,9 +1155,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" +checksum = "265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213" [[package]] name = "lock_api" @@ -1320,9 +1283,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10acf907b94fc1b1a152d08ef97e7759650268cf986bf127f387e602b02c7e5a" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "oorandom" @@ -1330,12 +1293,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "output_vt100" version = "0.1.2" @@ -1429,6 +1386,12 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pico-args" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d70072c20945e1ab871c472a285fc772aefd4f5407723c206242f2c6f94595d6" + [[package]] name = "plotters" version = "0.3.0" @@ -1737,18 +1700,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer", - "digest 0.8.1", - "fake-simd", - "opaque-debug", -] - [[package]] name = "siphasher" version = "0.3.3" @@ -1777,15 +1728,8 @@ dependencies = [ "new_debug_unreachable", "phf_shared", "precomputed-hash", - "serde", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "subtle" version = "2.4.0" @@ -1794,9 +1738,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" dependencies = [ "proc-macro2", "quote", @@ -1878,10 +1822,19 @@ dependencies = [ ] [[package]] -name = "tinytemplate" -version = "1.2.0" +name = "tiny-keccak" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ada8616fad06a2d0c455adc530de4ef57605a8120cc65da9653e0e9623ca74" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ "serde", "serde_json", diff --git a/crates/air-parser/Cargo.toml b/crates/air-parser/Cargo.toml index ca7f76be..0f86e6b0 100644 --- a/crates/air-parser/Cargo.toml +++ b/crates/air-parser/Cargo.toml @@ -6,16 +6,16 @@ edition = "2018" license = "Apache-2.0" [build-dependencies] -lalrpop = { git = "https://github.com/fluencelabs/lalrpop", branch = "cloneable_parser", version = "0.19.1", features = ["lexer"] } +lalrpop = "0.19.5" [dependencies] -lalrpop-util = { git = "https://github.com/fluencelabs/lalrpop", branch = "cloneable_parser", version = "0.19.1", features = ["lexer"] } +lalrpop-util = "0.19.5" regex = "1.4.1" codespan = "0.9.5" codespan-reporting = "0.9.5" # TODO: hide serde behind a feature -serde = { version = "=1.0.118", features = ["rc"] } +serde = { version = "=1.0.118", features = ["rc", "derive"] } serde_json = "=1.0.61" itertools = "0.10.0" diff --git a/crates/air-parser/src/parser/air.rs b/crates/air-parser/src/parser/air.rs index ae89d60a..98bfffdf 100644 --- a/crates/air-parser/src/parser/air.rs +++ b/crates/air-parser/src/parser/air.rs @@ -1,5 +1,5 @@ -// auto-generated: "lalrpop 0.19.1" -// sha256: 398273c66ddd518ce5f42ace9c37bc569614e0e19f8eb9a5c85b7385c932 +// auto-generated: "lalrpop 0.19.5" +// sha3: 13a01be9e7bfafe105fe6361390cdd12c867e4697238a32a5ba72af895616ee use crate::parser::ast::*; use crate::parser::air_parser::into_variable_and_path; use crate::parser::air_parser::make_flattened_error; @@ -12,6 +12,8 @@ use std::rc::Rc; extern crate lalrpop_util as __lalrpop_util; #[allow(unused_imports)] use self::__lalrpop_util::state_machine as __state_machine; +extern crate core; +extern crate alloc; #[cfg_attr(rustfmt, rustfmt_skip)] mod __parse__AIR { @@ -29,9 +31,11 @@ mod __parse__AIR { extern crate lalrpop_util as __lalrpop_util; #[allow(unused_imports)] use self::__lalrpop_util::state_machine as __state_machine; + extern crate core; + extern crate alloc; use super::__ToTriple; #[allow(dead_code)] - pub enum __Symbol<'input> + pub(crate) enum __Symbol<'input> { Variant0(Token<'input>), Variant1(&'input str), @@ -40,7 +44,7 @@ mod __parse__AIR { Variant4(Number), Variant5(__lalrpop_util::ErrorRecovery, LexerError>), Variant6(CallInstrArgValue<'input>), - Variant7(::std::vec::Vec>), + Variant7(alloc::vec::Vec>), Variant8(usize), Variant9(Box>), Variant10(Vec>), @@ -49,7 +53,7 @@ mod __parse__AIR { Variant13(IterableValue<'input>), Variant14(MatchableValue<'input>), Variant15(CallOutputValue<'input>), - Variant16(::std::option::Option>), + Variant16(core::option::Option>), Variant17(PeerPart<'input>), } const __ACTION: &[i8] = &[ @@ -439,7 +443,7 @@ mod __parse__AIR { _ => 0, } } - fn __expected_tokens(__state: i8) -> Vec<::std::string::String> { + fn __expected_tokens(__state: i8) -> alloc::vec::Vec { const __TERMINAL: &[&str] = &[ r###""(""###, r###"")""###, @@ -468,16 +472,16 @@ mod __parse__AIR { if next_state == 0 { None } else { - Some(terminal.to_string()) + Some(alloc::string::ToString::to_string(terminal)) } }).collect() } - pub struct __StateMachine<'err, 'input> + pub(crate) struct __StateMachine<'err, 'input> where 'input: 'err { input: &'input str, errors: &'err mut Vec, LexerError>>, - __phantom: ::std::marker::PhantomData<(&'err (), &'input ())>, + __phantom: core::marker::PhantomData<(&'err (), &'input ())>, } impl<'err, 'input> __state_machine::ParserDefinition for __StateMachine<'err, 'input> where 'input: 'err @@ -505,7 +509,7 @@ mod __parse__AIR { #[inline] fn token_to_index(&self, token: &Self::Token) -> Option { - __token_to_integer(token, ::std::marker::PhantomData::<(&(), &())>) + __token_to_integer(token, core::marker::PhantomData::<(&(), &())>) } #[inline] @@ -529,10 +533,10 @@ mod __parse__AIR { } fn token_to_symbol(&self, token_index: usize, token: Self::Token) -> Self::Symbol { - __token_to_symbol(token_index, token, ::std::marker::PhantomData::<(&(), &())>) + __token_to_symbol(token_index, token, core::marker::PhantomData::<(&(), &())>) } - fn expected_tokens(&self, state: i8) -> Vec { + fn expected_tokens(&self, state: i8) -> alloc::vec::Vec { __expected_tokens(state) } @@ -553,8 +557,8 @@ mod __parse__AIR { &mut self, action: i8, start_location: Option<&Self::Location>, - states: &mut Vec, - symbols: &mut Vec<__state_machine::SymbolTriple>, + states: &mut alloc::vec::Vec, + symbols: &mut alloc::vec::Vec<__state_machine::SymbolTriple>, ) -> Option<__state_machine::ParseResult> { __reduce( self.input, @@ -563,12 +567,12 @@ mod __parse__AIR { start_location, states, symbols, - ::std::marker::PhantomData::<(&(), &())>, + core::marker::PhantomData::<(&(), &())>, ) } fn simulate_reduce(&self, action: i8) -> __state_machine::SimulatedReduce { - __simulate_reduce(action, ::std::marker::PhantomData::<(&(), &())>) + __simulate_reduce(action, core::marker::PhantomData::<(&(), &())>) } } fn __token_to_integer< @@ -576,7 +580,7 @@ mod __parse__AIR { 'input, >( __token: &Token<'input>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> Option { match *__token { @@ -610,7 +614,7 @@ mod __parse__AIR { >( __token_index: usize, __token: Token<'input>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> __Symbol<'input> { match __token_index { @@ -639,7 +643,7 @@ mod __parse__AIR { 'input, >( __reduce_index: i8, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> __state_machine::SimulatedReduce<__StateMachine<'err, 'input>> where 'input: 'err, @@ -943,7 +947,6 @@ mod __parse__AIR { _ => panic!("invalid reduction index {}", __reduce_index) } } - #[derive(Clone)] pub struct AIRParser { _priv: (), } @@ -974,7 +977,7 @@ mod __parse__AIR { __StateMachine { input, errors, - __phantom: ::std::marker::PhantomData::<(&(), &())>, + __phantom: core::marker::PhantomData::<(&(), &())>, }, __tokens, ) @@ -989,7 +992,7 @@ mod __parse__AIR { __error_state: i8, __states: & [i8], __opt_integer: Option, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> bool { let mut __states = __states.to_vec(); @@ -1003,7 +1006,7 @@ mod __parse__AIR { }; if __action == 0 { return false; } if __action > 0 { return true; } - let (__to_pop, __nt) = match __simulate_reduce(-(__action + 1), ::std::marker::PhantomData::<(&(), &())>) { + let (__to_pop, __nt) = match __simulate_reduce(-(__action + 1), core::marker::PhantomData::<(&(), &())>) { __state_machine::SimulatedReduce::Reduce { states_to_pop, nonterminal_produced } => (states_to_pop, nonterminal_produced), @@ -1024,158 +1027,158 @@ mod __parse__AIR { errors: &'err mut Vec, LexerError>>, __action: i8, __lookahead_start: Option<&usize>, - __states: &mut ::std::vec::Vec, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __states: &mut alloc::vec::Vec, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> Option>,__lalrpop_util::ParseError, LexerError>>> { let (__pop_states, __nonterminal) = match __action { 0 => { - __reduce0(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce0(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 1 => { - __reduce1(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce1(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 2 => { - __reduce2(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce2(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 3 => { - __reduce3(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce3(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 4 => { - __reduce4(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce4(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 5 => { - __reduce5(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce5(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 6 => { - __reduce6(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce6(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 7 => { - __reduce7(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce7(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 8 => { - __reduce8(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce8(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 9 => { - __reduce9(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce9(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 10 => { - __reduce10(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce10(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 11 => { - __reduce11(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce11(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 12 => { - __reduce12(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce12(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 13 => { - __reduce13(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce13(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 14 => { - __reduce14(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce14(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 15 => { - __reduce15(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce15(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 16 => { - __reduce16(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce16(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 17 => { - __reduce17(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce17(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 18 => { - __reduce18(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce18(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 19 => { - __reduce19(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce19(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 20 => { - __reduce20(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce20(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 21 => { - __reduce21(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce21(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 22 => { - __reduce22(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce22(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 23 => { - __reduce23(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce23(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 24 => { - __reduce24(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce24(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 25 => { - __reduce25(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce25(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 26 => { - __reduce26(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce26(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 27 => { - __reduce27(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce27(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 28 => { - __reduce28(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce28(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 29 => { - __reduce29(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce29(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 30 => { - __reduce30(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce30(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 31 => { - __reduce31(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce31(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 32 => { - __reduce32(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce32(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 33 => { - __reduce33(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce33(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 34 => { - __reduce34(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce34(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 35 => { - __reduce35(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce35(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 36 => { - __reduce36(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce36(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 37 => { - __reduce37(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce37(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 38 => { - __reduce38(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce38(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 39 => { - __reduce39(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce39(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 40 => { - __reduce40(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce40(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 41 => { - __reduce41(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce41(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 42 => { - __reduce42(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce42(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 43 => { - __reduce43(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce43(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 44 => { - __reduce44(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce44(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 45 => { - __reduce45(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce45(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 46 => { - __reduce46(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce46(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 47 => { - __reduce47(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce47(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 48 => { - __reduce48(input, errors, __lookahead_start, __symbols, ::std::marker::PhantomData::<(&(), &())>) + __reduce48(input, errors, __lookahead_start, __symbols, core::marker::PhantomData::<(&(), &())>) } 49 => { // __AIR = AIR => ActionFn(0); @@ -1201,7 +1204,7 @@ mod __parse__AIR { fn __pop_Variant3< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, (&'input str, usize, bool), usize) { match __symbols.pop() { @@ -1212,7 +1215,7 @@ mod __parse__AIR { fn __pop_Variant9< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, Box>, usize) { match __symbols.pop() { @@ -1223,7 +1226,7 @@ mod __parse__AIR { fn __pop_Variant6< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, CallInstrArgValue<'input>, usize) { match __symbols.pop() { @@ -1234,7 +1237,7 @@ mod __parse__AIR { fn __pop_Variant11< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, CallInstrValue<'input>, usize) { match __symbols.pop() { @@ -1245,7 +1248,7 @@ mod __parse__AIR { fn __pop_Variant15< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, CallOutputValue<'input>, usize) { match __symbols.pop() { @@ -1256,7 +1259,7 @@ mod __parse__AIR { fn __pop_Variant12< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, FunctionPart<'input>, usize) { match __symbols.pop() { @@ -1267,7 +1270,7 @@ mod __parse__AIR { fn __pop_Variant13< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, IterableValue<'input>, usize) { match __symbols.pop() { @@ -1278,7 +1281,7 @@ mod __parse__AIR { fn __pop_Variant14< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, MatchableValue<'input>, usize) { match __symbols.pop() { @@ -1289,7 +1292,7 @@ mod __parse__AIR { fn __pop_Variant4< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, Number, usize) { match __symbols.pop() { @@ -1300,7 +1303,7 @@ mod __parse__AIR { fn __pop_Variant17< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, PeerPart<'input>, usize) { match __symbols.pop() { @@ -1311,7 +1314,7 @@ mod __parse__AIR { fn __pop_Variant0< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, Token<'input>, usize) { match __symbols.pop() { @@ -1322,7 +1325,7 @@ mod __parse__AIR { fn __pop_Variant10< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, Vec>, usize) { match __symbols.pop() { @@ -1333,7 +1336,7 @@ mod __parse__AIR { fn __pop_Variant5< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, __lalrpop_util::ErrorRecovery, LexerError>, usize) { match __symbols.pop() { @@ -1341,10 +1344,21 @@ mod __parse__AIR { _ => __symbol_type_mismatch() } } + fn __pop_Variant7< + 'input, + >( + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> + ) -> (usize, alloc::vec::Vec>, usize) + { + match __symbols.pop() { + Some((__l, __Symbol::Variant7(__v), __r)) => (__l, __v, __r), + _ => __symbol_type_mismatch() + } + } fn __pop_Variant2< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, bool, usize) { match __symbols.pop() { @@ -1352,10 +1366,21 @@ mod __parse__AIR { _ => __symbol_type_mismatch() } } + fn __pop_Variant16< + 'input, + >( + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> + ) -> (usize, core::option::Option>, usize) + { + match __symbols.pop() { + Some((__l, __Symbol::Variant16(__v), __r)) => (__l, __v, __r), + _ => __symbol_type_mismatch() + } + } fn __pop_Variant8< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, usize, usize) { match __symbols.pop() { @@ -1363,32 +1388,10 @@ mod __parse__AIR { _ => __symbol_type_mismatch() } } - fn __pop_Variant16< - 'input, - >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> - ) -> (usize, ::std::option::Option>, usize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant16(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } - fn __pop_Variant7< - 'input, - >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> - ) -> (usize, ::std::vec::Vec>, usize) - { - match __symbols.pop() { - Some((__l, __Symbol::Variant7(__v), __r)) => (__l, __v, __r), - _ => __symbol_type_mismatch() - } - } fn __pop_Variant1< 'input, >( - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)> + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)> ) -> (usize, &'input str, usize) { match __symbols.pop() { @@ -1403,8 +1406,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // () = Arg => ActionFn(43); @@ -1422,8 +1425,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // ()* = => ActionFn(41); @@ -1440,8 +1443,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // ()* = ()+ => ActionFn(42); @@ -1459,8 +1462,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // ()+ = Arg => ActionFn(48); @@ -1478,8 +1481,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // ()+ = ()+, Arg => ActionFn(49); @@ -1499,8 +1502,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // @L = => ActionFn(40); @@ -1517,8 +1520,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // @R = => ActionFn(39); @@ -1535,8 +1538,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // AIR = Instr => ActionFn(1); @@ -1554,8 +1557,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Arg = CallInstrArgValue => ActionFn(26); @@ -1573,8 +1576,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Args = "[", "]" => ActionFn(50); @@ -1594,8 +1597,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Args = "[", ()+, "]" => ActionFn(51); @@ -1616,8 +1619,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = Literal => ActionFn(27); @@ -1635,8 +1638,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = Alphanumeric => ActionFn(28); @@ -1654,8 +1657,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = JsonPath => ActionFn(29); @@ -1673,8 +1676,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = Number => ActionFn(30); @@ -1692,8 +1695,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = Boolean => ActionFn(31); @@ -1711,8 +1714,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = InitPeerId => ActionFn(32); @@ -1730,8 +1733,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrArgValue = LastError => ActionFn(33); @@ -1749,8 +1752,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrValue = Literal => ActionFn(22); @@ -1768,8 +1771,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrValue = Alphanumeric => ActionFn(23); @@ -1787,8 +1790,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrValue = JsonPath => ActionFn(53); @@ -1806,8 +1809,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // CallInstrValue = InitPeerId => ActionFn(25); @@ -1825,8 +1828,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // FPart = Function => ActionFn(13); @@ -1844,8 +1847,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // FPart = "(", ServiceId, Function, ")" => ActionFn(14); @@ -1867,8 +1870,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Function = CallInstrValue => ActionFn(19); @@ -1886,8 +1889,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", call, PeerPart, FPart, Args, Output, ")" => ActionFn(54); @@ -1912,8 +1915,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", call, PeerPart, FPart, Args, ")" => ActionFn(55); @@ -1937,8 +1940,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", seq, Instr, Instr, ")" => ActionFn(3); @@ -1961,8 +1964,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", par, Instr, Instr, ")" => ActionFn(4); @@ -1985,8 +1988,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", null, ")" => ActionFn(5); @@ -2007,8 +2010,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", fold, Iterable, Alphanumeric, Instr, ")" => ActionFn(6); @@ -2032,8 +2035,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", next, Alphanumeric, ")" => ActionFn(7); @@ -2055,8 +2058,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", xor, Instr, Instr, ")" => ActionFn(8); @@ -2079,8 +2082,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", match_, Matchable, Matchable, Instr, ")" => ActionFn(9); @@ -2104,8 +2107,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = "(", mismatch, Matchable, Matchable, Instr, ")" => ActionFn(10); @@ -2129,8 +2132,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Instr = error => ActionFn(11); @@ -2148,8 +2151,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Iterable = Alphanumeric => ActionFn(34); @@ -2167,8 +2170,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Iterable = JsonPath => ActionFn(35); @@ -2186,8 +2189,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Matchable = Alphanumeric => ActionFn(36); @@ -2205,8 +2208,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Matchable = Literal => ActionFn(37); @@ -2224,8 +2227,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Matchable = JsonPath => ActionFn(38); @@ -2243,8 +2246,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Output = Alphanumeric => ActionFn(17); @@ -2262,8 +2265,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Output = Accumulator => ActionFn(18); @@ -2281,8 +2284,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Output? = Output => ActionFn(44); @@ -2300,8 +2303,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // Output? = => ActionFn(45); @@ -2318,8 +2321,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // PeerId = CallInstrValue => ActionFn(20); @@ -2337,8 +2340,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // PeerPart = PeerId => ActionFn(15); @@ -2356,8 +2359,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // PeerPart = "(", PeerId, ServiceId, ")" => ActionFn(16); @@ -2379,8 +2382,8 @@ mod __parse__AIR { input: &'input str, errors: &'err mut Vec, LexerError>>, __lookahead_start: Option<&usize>, - __symbols: &mut ::std::vec::Vec<(usize,__Symbol<'input>,usize)>, - _: ::std::marker::PhantomData<(&'err (), &'input ())>, + __symbols: &mut alloc::vec::Vec<(usize,__Symbol<'input>,usize)>, + _: core::marker::PhantomData<(&'err (), &'input ())>, ) -> (usize, usize) { // ServiceId = CallInstrValue => ActionFn(21); @@ -2432,7 +2435,7 @@ fn __action2< (_, p, _): (usize, PeerPart<'input>, usize), (_, f, _): (usize, FunctionPart<'input>, usize), (_, args, _): (usize, Vec>, usize), - (_, output, _): (usize, ::std::option::Option>, usize), + (_, output, _): (usize, core::option::Option>, usize), (_, _, _): (usize, Token<'input>, usize), ) -> Box> { @@ -2609,7 +2612,7 @@ fn __action12< input: &'input str, errors: &'err mut Vec, LexerError>>, (_, _, _): (usize, Token<'input>, usize), - (_, args, _): (usize, ::std::vec::Vec>, usize), + (_, args, _): (usize, alloc::vec::Vec>, usize), (_, _, _): (usize, Token<'input>, usize), ) -> Vec> { @@ -3019,9 +3022,9 @@ fn __action41< errors: &'err mut Vec, LexerError>>, __lookbehind: &usize, __lookahead: &usize, -) -> ::std::vec::Vec> +) -> alloc::vec::Vec> { - vec![] + alloc::vec![] } #[allow(unused_variables)] @@ -3031,8 +3034,8 @@ fn __action42< >( input: &'input str, errors: &'err mut Vec, LexerError>>, - (_, v, _): (usize, ::std::vec::Vec>, usize), -) -> ::std::vec::Vec> + (_, v, _): (usize, alloc::vec::Vec>, usize), +) -> alloc::vec::Vec> { v } @@ -3058,7 +3061,7 @@ fn __action44< input: &'input str, errors: &'err mut Vec, LexerError>>, (_, __0, _): (usize, CallOutputValue<'input>, usize), -) -> ::std::option::Option> +) -> core::option::Option> { Some(__0) } @@ -3072,7 +3075,7 @@ fn __action45< errors: &'err mut Vec, LexerError>>, __lookbehind: &usize, __lookahead: &usize, -) -> ::std::option::Option> +) -> core::option::Option> { None } @@ -3085,9 +3088,9 @@ fn __action46< input: &'input str, errors: &'err mut Vec, LexerError>>, (_, __0, _): (usize, CallInstrArgValue<'input>, usize), -) -> ::std::vec::Vec> +) -> alloc::vec::Vec> { - vec![__0] + alloc::vec![__0] } #[allow(unused_variables)] @@ -3097,9 +3100,9 @@ fn __action47< >( input: &'input str, errors: &'err mut Vec, LexerError>>, - (_, v, _): (usize, ::std::vec::Vec>, usize), + (_, v, _): (usize, alloc::vec::Vec>, usize), (_, e, _): (usize, CallInstrArgValue<'input>, usize), -) -> ::std::vec::Vec> +) -> alloc::vec::Vec> { { let mut v = v; v.push(e); v } } @@ -3112,7 +3115,7 @@ fn __action48< input: &'input str, errors: &'err mut Vec, LexerError>>, __0: (usize, CallInstrArgValue<'input>, usize), -) -> ::std::vec::Vec> +) -> alloc::vec::Vec> { let __start0 = __0.0.clone(); let __end0 = __0.2.clone(); @@ -3136,9 +3139,9 @@ fn __action49< >( input: &'input str, errors: &'err mut Vec, LexerError>>, - __0: (usize, ::std::vec::Vec>, usize), + __0: (usize, alloc::vec::Vec>, usize), __1: (usize, CallInstrArgValue<'input>, usize), -) -> ::std::vec::Vec> +) -> alloc::vec::Vec> { let __start0 = __1.0.clone(); let __end0 = __1.2.clone(); @@ -3193,7 +3196,7 @@ fn __action51< input: &'input str, errors: &'err mut Vec, LexerError>>, __0: (usize, Token<'input>, usize), - __1: (usize, ::std::vec::Vec>, usize), + __1: (usize, alloc::vec::Vec>, usize), __2: (usize, Token<'input>, usize), ) -> Vec> { diff --git a/crates/polyplets/Cargo.toml b/crates/polyplets/Cargo.toml index ea470edb..2894e360 100644 --- a/crates/polyplets/Cargo.toml +++ b/crates/polyplets/Cargo.toml @@ -11,4 +11,4 @@ path = "src/lib.rs" [dependencies] fluence = { version = "0.4.2", features = ["logger"] } -serde = { version = "=1.0.118", features = ["rc"] } +serde = { version = "=1.0.118", features = ["rc", "derive"] }