Extend macro use in native functions
This commit is contained in:
parent
1947d66be5
commit
e85297bcbb
@ -8,85 +8,12 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use crate::{AnnotatedError, Instruction, Primitive, Span, Value, Vm, VmError};
|
use crate::{AnnotatedError, Instruction, Primitive, Span, Value, Vm, VmError};
|
||||||
|
|
||||||
// Assertio
|
|
||||||
const ASSERT: u8 = 0b0000_0000;
|
|
||||||
const ASSERT_EQ: u8 = 0b0000_0001;
|
|
||||||
const ASSERT_NE: u8 = 0b0000_0010;
|
|
||||||
const PANIC: u8 = 0b0000_0011;
|
|
||||||
|
|
||||||
// Type conversion
|
|
||||||
const PARSE: u8 = 0b0000_0100;
|
|
||||||
const TO_BYTE: u8 = 0b0000_0101;
|
|
||||||
const TO_FLOAT: u8 = 0b0000_0110;
|
|
||||||
const TO_INTEGER: u8 = 0b0000_0111;
|
|
||||||
const TO_STRING: u8 = 0b0000_1000;
|
|
||||||
|
|
||||||
// List and string
|
|
||||||
const ALL: u8 = 0b0000_1001;
|
|
||||||
const ANY: u8 = 0b0000_1010;
|
|
||||||
const APPEND: u8 = 0b0000_1011;
|
|
||||||
const CONTAINS: u8 = 0b0000_1100;
|
|
||||||
const DEDUP: u8 = 0b0000_1101;
|
|
||||||
const ENDS_WITH: u8 = 0b0000_1110;
|
|
||||||
const FIND: u8 = 0b0000_1111;
|
|
||||||
const GET: u8 = 0b0001_0000;
|
|
||||||
const INDEX_OF: u8 = 0b0001_0001;
|
|
||||||
const LENGTH: u8 = 0b0001_0010;
|
|
||||||
const PREPEND: u8 = 0b0001_0011;
|
|
||||||
const REPLACE: u8 = 0b0001_0100;
|
|
||||||
const SET: u8 = 0b0001_0101;
|
|
||||||
const STARTS_WITH: u8 = 0b0001_0110;
|
|
||||||
const SLICE: u8 = 0b0001_0111;
|
|
||||||
const SORT: u8 = 0b0001_1000;
|
|
||||||
const SPLIT: u8 = 0b0001_1001;
|
|
||||||
|
|
||||||
// List
|
|
||||||
const FLATTEN: u8 = 0b0001_1010;
|
|
||||||
const JOIN: u8 = 0b0001_1011;
|
|
||||||
const MAP: u8 = 0b0001_1100;
|
|
||||||
const REDUCE: u8 = 0b0001_1101;
|
|
||||||
const REMOVE: u8 = 0b0001_1110;
|
|
||||||
const REVERSE: u8 = 0b0001_1111;
|
|
||||||
const UNZIP: u8 = 0b0010_0000;
|
|
||||||
const ZIP: u8 = 0b0010_0001;
|
|
||||||
|
|
||||||
// String
|
|
||||||
const BYTES: u8 = 0b0010_0010;
|
|
||||||
const CHAR_AT: u8 = 0b0010_0011;
|
|
||||||
const CHAR_CODE_AT: u8 = 0b0010_0100;
|
|
||||||
const CHARS: u8 = 0b0010_0101;
|
|
||||||
const FORMAT: u8 = 0b0010_0110;
|
|
||||||
const REPEAT: u8 = 0b0010_0111;
|
|
||||||
const SPLIT_AT: u8 = 0b0010_1000;
|
|
||||||
const SPLIT_LINES: u8 = 0b0010_1001;
|
|
||||||
const SPLIT_WHITESPACE: u8 = 0b0010_1010;
|
|
||||||
const TO_LOWER_CASE: u8 = 0b0010_1011;
|
|
||||||
const TO_UPPER_CASE: u8 = 0b0010_1100;
|
|
||||||
const TRIM: u8 = 0b0010_1101;
|
|
||||||
const TRIM_END: u8 = 0b0010_1110;
|
|
||||||
const TRIM_START: u8 = 0b0010_1111;
|
|
||||||
|
|
||||||
// I/O
|
|
||||||
const READ_LINE: u8 = 0b0011_0000;
|
|
||||||
const WRITE_LINE: u8 = 0b0011_0001;
|
|
||||||
const WRITE: u8 = 0b0011_0010;
|
|
||||||
|
|
||||||
// Random
|
|
||||||
const RANDOM: u8 = 0b0011_0011;
|
|
||||||
const RANDOM_BYTE: u8 = 0b0011_0100;
|
|
||||||
const RANDOM_BYTES: u8 = 0b0011_0101;
|
|
||||||
const RANDOM_CHAR: u8 = 0b0011_0110;
|
|
||||||
const RANDOM_FLOAT: u8 = 0b0011_0111;
|
|
||||||
const RANDOM_INTEGER: u8 = 0b0011_1000;
|
|
||||||
const RANDOM_RANGE: u8 = 0b0011_1001;
|
|
||||||
const RANDOM_STRING: u8 = 0b0011_1010;
|
|
||||||
|
|
||||||
macro_rules! impl_from_str_for_native_function {
|
macro_rules! impl_from_str_for_native_function {
|
||||||
($(($name:ident, $str:expr, $returns_value:expr)),*) => {
|
($(($name:ident, $byte:literal, $str:expr, $returns_value:expr)),*) => {
|
||||||
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Serialize, Deserialize)]
|
||||||
pub enum NativeFunction {
|
pub enum NativeFunction {
|
||||||
$(
|
$(
|
||||||
$name,
|
$name = $byte as isize,
|
||||||
)*
|
)*
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,82 +44,113 @@ macro_rules! impl_from_str_for_native_function {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<u8> for NativeFunction {
|
||||||
|
fn from(byte: u8) -> Self {
|
||||||
|
match byte {
|
||||||
|
$(
|
||||||
|
$byte => NativeFunction::$name,
|
||||||
|
)*
|
||||||
|
_ => {
|
||||||
|
if cfg!(test) {
|
||||||
|
panic!("Invalid native function byte: {}", byte)
|
||||||
|
} else {
|
||||||
|
NativeFunction::Panic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<NativeFunction> for u8 {
|
||||||
|
fn from(native_function: NativeFunction) -> Self {
|
||||||
|
match native_function {
|
||||||
|
$(
|
||||||
|
NativeFunction::$name => $byte,
|
||||||
|
)*
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
impl_from_str_for_native_function! {
|
impl_from_str_for_native_function! {
|
||||||
// Assertion
|
// Assertion
|
||||||
(Assert, "assert", false),
|
(Assert, 0_u8, "assert", false),
|
||||||
(AssertEq, "assert_eq", false),
|
(AssertEqual, 1_u8, "assert_equal", false),
|
||||||
(AssertNe, "assert_ne", false),
|
(AssertNotEqual, 2_u8, "assert_not_equal", false),
|
||||||
(Panic, "panic", true),
|
(Panic, 3_u8, "panic", false),
|
||||||
|
|
||||||
// Type conversion
|
// Type conversion
|
||||||
(Parse, "parse", true),
|
(Parse, 4_u8, "parse", true),
|
||||||
(ToByte, "to_byte", true),
|
(ToByte, 5_u8, "to_byte", true),
|
||||||
(ToFloat, "to_float", true),
|
(ToFloat, 6_u8, "to_float", true),
|
||||||
(ToInteger, "to_integer", true),
|
(ToInteger, 7_u8, "to_integer", true),
|
||||||
(ToString, "to_string", true),
|
(ToString, 8_u8, "to_string", true),
|
||||||
|
|
||||||
// List and string
|
// List and string
|
||||||
(All, "all", true),
|
(All, 9_u8, "all", true),
|
||||||
(Any, "any", true),
|
(Any, 10_u8, "any", true),
|
||||||
(Append, "append", false),
|
(Append, 11_u8, "append", false),
|
||||||
(Contains, "contains", true),
|
(Contains, 12_u8, "contains", true),
|
||||||
(Dedup, "dedup", false),
|
(Dedup, 13_u8, "dedup", false),
|
||||||
(EndsWith, "ends_with", true),
|
(EndsWith, 14_u8, "ends_with", true),
|
||||||
(Find, "find", true),
|
(Find, 15_u8, "find", true),
|
||||||
(Get, "get", true),
|
(Get, 16_u8, "get", true),
|
||||||
(IndexOf, "index_of", true),
|
(IndexOf, 17_u8, "index_of", true),
|
||||||
(Length, "length", true),
|
(Length, 18_u8, "length", true),
|
||||||
(Prepend, "prepend", false),
|
(Prepend, 19_u8, "prepend", false),
|
||||||
(Replace, "replace", false),
|
(Replace, 20_u8, "replace", false),
|
||||||
(Set, "set", false),
|
(Set, 21_u8, "set", false),
|
||||||
(StartsWith, "starts_with", true),
|
(StartsWith, 22_u8, "starts_with", true),
|
||||||
(Slice, "slice", true),
|
(Slice, 23_u8, "slice", true),
|
||||||
(Sort, "sort", false),
|
(Sort, 24_u8, "sort", false),
|
||||||
(Split, "split", true),
|
(Split, 25_u8, "split", true),
|
||||||
|
|
||||||
// List
|
// List
|
||||||
(Flatten, "flatten", true),
|
(Flatten, 26_u8, "flatten", false),
|
||||||
(Join, "join", true),
|
(Join, 27_u8, "join", true),
|
||||||
(Map, "map", true),
|
(Map, 28_u8, "map", true),
|
||||||
(Reduce, "reduce", true),
|
(Reduce, 29_u8, "reduce", true),
|
||||||
(Remove, "remove", false),
|
(Remove, 30_u8, "remove", false),
|
||||||
(Reverse, "reverse", false),
|
(Reverse, 31_u8, "reverse", false),
|
||||||
(Unzip, "unzip", true),
|
(Unzip, 32_u8, "unzip", true),
|
||||||
(Zip, "zip", true),
|
(Zip, 33_u8, "zip", true),
|
||||||
|
|
||||||
// String
|
// String
|
||||||
(Bytes, "bytes", true),
|
(Bytes, 34_u8, "bytes", true),
|
||||||
(CharAt, "char_at", true),
|
(CharAt, 35_u8, "char_at", true),
|
||||||
(CharCodeAt, "char_code_at", true),
|
(CharCodeAt, 36_u8, "char_code_at", true),
|
||||||
(Chars, "chars", true),
|
(Chars, 37_u8, "chars", true),
|
||||||
(Format, "format", true),
|
(Format, 38_u8, "format", true),
|
||||||
(Repeat, "repeat", true),
|
(Repeat, 39_u8, "repeat", true),
|
||||||
(SplitAt, "split_at", true),
|
(SplitAt, 40_u8, "split_at", true),
|
||||||
(SplitLines, "split_lines", true),
|
(SplitLines, 41_u8, "split_lines", true),
|
||||||
(SplitWhitespace, "split_whitespace", true),
|
(SplitWhitespace, 42_u8, "split_whitespace", true),
|
||||||
(ToLowerCase, "to_lower_case", true),
|
(ToLowerCase, 43_u8, "to_lower_case", true),
|
||||||
(ToUpperCase, "to_upper_case", true),
|
(ToUpperCase, 44_u8, "to_upper_case", true),
|
||||||
(Trim, "trim", true),
|
(Trim, 45_u8, "trim", true),
|
||||||
(TrimEnd, "trim_end", true),
|
(TrimEnd, 46_u8, "trim_end", true),
|
||||||
(TrimStart, "trim_start", true),
|
(TrimStart, 47_u8, "trim_start", true),
|
||||||
|
|
||||||
// I/O
|
// I/O
|
||||||
(ReadLine, "read_line", true),
|
(Read, 48_u8, "read", true),
|
||||||
(WriteLine, "write_line", false),
|
(ReadFile, 49_u8, "read_file", true),
|
||||||
(Write, "write", false),
|
(ReadLine, 50_u8, "read_line", true),
|
||||||
|
(ReadTo, 51_u8, "read_until", false),
|
||||||
|
(ReadUntil, 52_u8, "read_to", false),
|
||||||
|
(WriteLine, 53_u8, "write_line", false),
|
||||||
|
(Write, 54_u8, "write", false),
|
||||||
|
|
||||||
// Random
|
// Random
|
||||||
(Random, "random", true),
|
(Random, 55_u8, "random", true),
|
||||||
(RandomByte, "random_byte", true),
|
(RandomByte, 56_u8, "random_byte", true),
|
||||||
(RandomBytes, "random_bytes", true),
|
(RandomBytes, 57_u8, "random_bytes", true),
|
||||||
(RandomChar, "random_char", true),
|
(RandomChar, 58_u8, "random_char", true),
|
||||||
(RandomFloat, "random_float", true),
|
(RandomFloat, 59_u8, "random_float", true),
|
||||||
(RandomInteger, "random_integer", true),
|
(RandomInteger, 60_u8, "random_integer", true),
|
||||||
(RandomRange, "random_range", true),
|
(RandomRange, 61_u8, "random_range", true),
|
||||||
(RandomString, "random_string", true)
|
(RandomString, 62_u8, "random_string", true)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl NativeFunction {
|
impl NativeFunction {
|
||||||
@ -325,144 +283,6 @@ impl NativeFunction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<u8> for NativeFunction {
|
|
||||||
fn from(byte: u8) -> Self {
|
|
||||||
match byte {
|
|
||||||
ALL => NativeFunction::Assert,
|
|
||||||
ASSERT_EQ => NativeFunction::AssertEq,
|
|
||||||
ASSERT_NE => NativeFunction::AssertNe,
|
|
||||||
APPEND => NativeFunction::Append,
|
|
||||||
ANY => NativeFunction::Any,
|
|
||||||
BYTES => NativeFunction::Bytes,
|
|
||||||
CHAR_AT => NativeFunction::CharAt,
|
|
||||||
CHAR_CODE_AT => NativeFunction::CharCodeAt,
|
|
||||||
CHARS => NativeFunction::Chars,
|
|
||||||
CONTAINS => NativeFunction::Contains,
|
|
||||||
DEDUP => NativeFunction::Dedup,
|
|
||||||
ENDS_WITH => NativeFunction::EndsWith,
|
|
||||||
FIND => NativeFunction::Find,
|
|
||||||
FLATTEN => NativeFunction::Flatten,
|
|
||||||
FORMAT => NativeFunction::Format,
|
|
||||||
GET => NativeFunction::Get,
|
|
||||||
INDEX_OF => NativeFunction::IndexOf,
|
|
||||||
JOIN => NativeFunction::Join,
|
|
||||||
LENGTH => NativeFunction::Length,
|
|
||||||
MAP => NativeFunction::Map,
|
|
||||||
PANIC => NativeFunction::Panic,
|
|
||||||
PARSE => NativeFunction::Parse,
|
|
||||||
PREPEND => NativeFunction::Prepend,
|
|
||||||
RANDOM => NativeFunction::Random,
|
|
||||||
RANDOM_BYTE => NativeFunction::RandomByte,
|
|
||||||
RANDOM_BYTES => NativeFunction::RandomBytes,
|
|
||||||
RANDOM_CHAR => NativeFunction::RandomChar,
|
|
||||||
RANDOM_FLOAT => NativeFunction::RandomFloat,
|
|
||||||
RANDOM_INTEGER => NativeFunction::RandomInteger,
|
|
||||||
RANDOM_RANGE => NativeFunction::RandomRange,
|
|
||||||
RANDOM_STRING => NativeFunction::RandomString,
|
|
||||||
READ_LINE => NativeFunction::ReadLine,
|
|
||||||
REDUCE => NativeFunction::Reduce,
|
|
||||||
REMOVE => NativeFunction::Remove,
|
|
||||||
REPEAT => NativeFunction::Repeat,
|
|
||||||
REPLACE => NativeFunction::Replace,
|
|
||||||
REVERSE => NativeFunction::Reverse,
|
|
||||||
SET => NativeFunction::Set,
|
|
||||||
SLICE => NativeFunction::Slice,
|
|
||||||
SORT => NativeFunction::Sort,
|
|
||||||
SPLIT => NativeFunction::Split,
|
|
||||||
SPLIT_AT => NativeFunction::SplitAt,
|
|
||||||
SPLIT_LINES => NativeFunction::SplitLines,
|
|
||||||
SPLIT_WHITESPACE => NativeFunction::SplitWhitespace,
|
|
||||||
STARTS_WITH => NativeFunction::StartsWith,
|
|
||||||
TO_BYTE => NativeFunction::ToByte,
|
|
||||||
TO_FLOAT => NativeFunction::ToFloat,
|
|
||||||
TO_INTEGER => NativeFunction::ToInteger,
|
|
||||||
TO_LOWER_CASE => NativeFunction::ToLowerCase,
|
|
||||||
TO_STRING => NativeFunction::ToString,
|
|
||||||
TO_UPPER_CASE => NativeFunction::ToUpperCase,
|
|
||||||
TRIM => NativeFunction::Trim,
|
|
||||||
TRIM_END => NativeFunction::TrimEnd,
|
|
||||||
TRIM_START => NativeFunction::TrimStart,
|
|
||||||
UNZIP => NativeFunction::Unzip,
|
|
||||||
WRITE => NativeFunction::Write,
|
|
||||||
WRITE_LINE => NativeFunction::WriteLine,
|
|
||||||
ZIP => NativeFunction::Zip,
|
|
||||||
_ => {
|
|
||||||
if cfg!(test) {
|
|
||||||
panic!("Invalid native function byte: {}", byte)
|
|
||||||
} else {
|
|
||||||
NativeFunction::Panic
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<NativeFunction> for u8 {
|
|
||||||
fn from(native_function: NativeFunction) -> Self {
|
|
||||||
match native_function {
|
|
||||||
NativeFunction::All => ALL,
|
|
||||||
NativeFunction::Any => ANY,
|
|
||||||
NativeFunction::Append => APPEND,
|
|
||||||
NativeFunction::Assert => ASSERT,
|
|
||||||
NativeFunction::AssertEq => ASSERT_EQ,
|
|
||||||
NativeFunction::AssertNe => ASSERT_NE,
|
|
||||||
NativeFunction::Bytes => BYTES,
|
|
||||||
NativeFunction::CharAt => CHAR_AT,
|
|
||||||
NativeFunction::CharCodeAt => CHAR_CODE_AT,
|
|
||||||
NativeFunction::Chars => CHARS,
|
|
||||||
NativeFunction::Contains => CONTAINS,
|
|
||||||
NativeFunction::Dedup => DEDUP,
|
|
||||||
NativeFunction::EndsWith => ENDS_WITH,
|
|
||||||
NativeFunction::Find => FIND,
|
|
||||||
NativeFunction::Flatten => FLATTEN,
|
|
||||||
NativeFunction::Format => FORMAT,
|
|
||||||
NativeFunction::Get => GET,
|
|
||||||
NativeFunction::IndexOf => INDEX_OF,
|
|
||||||
NativeFunction::Join => JOIN,
|
|
||||||
NativeFunction::Length => LENGTH,
|
|
||||||
NativeFunction::Map => MAP,
|
|
||||||
NativeFunction::Panic => PANIC,
|
|
||||||
NativeFunction::Parse => PARSE,
|
|
||||||
NativeFunction::Prepend => PREPEND,
|
|
||||||
NativeFunction::Random => RANDOM,
|
|
||||||
NativeFunction::RandomByte => RANDOM_BYTE,
|
|
||||||
NativeFunction::RandomBytes => RANDOM_BYTES,
|
|
||||||
NativeFunction::RandomChar => RANDOM_CHAR,
|
|
||||||
NativeFunction::RandomFloat => RANDOM_FLOAT,
|
|
||||||
NativeFunction::RandomInteger => RANDOM_INTEGER,
|
|
||||||
NativeFunction::RandomRange => RANDOM_RANGE,
|
|
||||||
NativeFunction::RandomString => RANDOM_STRING,
|
|
||||||
NativeFunction::ReadLine => READ_LINE,
|
|
||||||
NativeFunction::Reduce => REDUCE,
|
|
||||||
NativeFunction::Remove => REMOVE,
|
|
||||||
NativeFunction::Repeat => REPEAT,
|
|
||||||
NativeFunction::Replace => REPLACE,
|
|
||||||
NativeFunction::Reverse => REVERSE,
|
|
||||||
NativeFunction::Set => SET,
|
|
||||||
NativeFunction::Slice => SLICE,
|
|
||||||
NativeFunction::Sort => SORT,
|
|
||||||
NativeFunction::Split => SPLIT,
|
|
||||||
NativeFunction::SplitAt => SPLIT_AT,
|
|
||||||
NativeFunction::SplitLines => SPLIT_LINES,
|
|
||||||
NativeFunction::SplitWhitespace => SPLIT_WHITESPACE,
|
|
||||||
NativeFunction::StartsWith => STARTS_WITH,
|
|
||||||
NativeFunction::ToByte => TO_BYTE,
|
|
||||||
NativeFunction::ToFloat => TO_FLOAT,
|
|
||||||
NativeFunction::ToInteger => TO_INTEGER,
|
|
||||||
NativeFunction::ToLowerCase => TO_LOWER_CASE,
|
|
||||||
NativeFunction::ToString => TO_STRING,
|
|
||||||
NativeFunction::ToUpperCase => TO_UPPER_CASE,
|
|
||||||
NativeFunction::Trim => TRIM,
|
|
||||||
NativeFunction::TrimEnd => TRIM_END,
|
|
||||||
NativeFunction::TrimStart => TRIM_START,
|
|
||||||
NativeFunction::Unzip => UNZIP,
|
|
||||||
NativeFunction::Write => WRITE,
|
|
||||||
NativeFunction::WriteLine => WRITE_LINE,
|
|
||||||
NativeFunction::Zip => ZIP,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for NativeFunction {
|
impl Display for NativeFunction {
|
||||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||||
write!(f, "{}", self.as_str())
|
write!(f, "{}", self.as_str())
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user