summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock30
-rw-r--r--dhall/Cargo.toml1
-rw-r--r--dhall/src/binary.rs213
-rw-r--r--dhall/src/lib.rs2
-rw-r--r--dhall/tests/macros.rs16
-rw-r--r--dhall/tests/tests.rs16
-rw-r--r--dhall_core/src/core.rs6
7 files changed, 270 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 383fdaf..0c18bc6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,6 +42,11 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "byteorder"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "dhall"
version = "0.1.0"
dependencies = [
@@ -50,6 +55,7 @@ dependencies = [
"dhall_generator 0.1.0",
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_cbor 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -110,6 +116,11 @@ dependencies = [
]
[[package]]
+name = "half"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "itertools"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -213,6 +224,21 @@ dependencies = [
]
[[package]]
+name = "serde"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde_cbor"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "half 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "sha-1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -291,10 +317,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
"checksum bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be0fdd54b507df8f22012890aadd099979befdba27713c767993f8380112ca7c"
+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
"checksum either 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c67353c641dc847124ea1902d69bd753dee9bb3beff9aa3662ecf86c971d1fac"
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
"checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
+"checksum half 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9353c2a89d550b58fa0061d8ed8d002a7d8cdf2494eb0e432859bd3a9e543836"
"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)" = "33b27d8490dbe1f9704b0088d61e8d46edc10d5673a8829836c6ded26a9912c7"
@@ -308,6 +336,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3"
"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
+"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
+"checksum serde_cbor 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "45cd6d95391b16cd57e88b68be41d504183b7faae22030c0cc3b3f73dd57b2fd"
"checksum sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9d1f3b5de8a167ab06834a7c883bd197f2191e1dda1a22d9ccfeedbf9aded"
"checksum syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)" = "525bd55255f03c816e5d7f615587bd13030c7103354fadb104993dcee6a788ec"
"checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1"
diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml
index c303ac3..12622f8 100644
--- a/dhall/Cargo.toml
+++ b/dhall/Cargo.toml
@@ -12,5 +12,6 @@ bytecount = "0.5.1"
itertools = "0.8.0"
lalrpop-util = "0.16.3"
term-painter = "0.2.3"
+serde_cbor = "0.9.0"
dhall_core = { path = "../dhall_core" }
dhall_generator = { path = "../dhall_generator" }
diff --git a/dhall/src/binary.rs b/dhall/src/binary.rs
new file mode 100644
index 0000000..0f09987
--- /dev/null
+++ b/dhall/src/binary.rs
@@ -0,0 +1,213 @@
+use dhall_core::*;
+use itertools::*;
+use serde_cbor::value::value as cbor;
+
+type ParsedExpr = Expr<X, Import>;
+
+#[derive(Debug)]
+pub enum DecodeError {
+ CBORError(serde_cbor::error::Error),
+ WrongFormatError,
+}
+
+pub fn decode(data: &[u8]) -> Result<ParsedExpr, DecodeError> {
+ match serde_cbor::de::from_slice(data) {
+ Ok(v) => cbor_value_to_dhall(&v),
+ Err(e) => Err(DecodeError::CBORError(e)),
+ }
+}
+
+fn cbor_value_to_dhall(data: &cbor::Value) -> Result<ParsedExpr, DecodeError> {
+ use cbor::Value::*;
+ use dhall_core::{BinOp, Builtin, Const};
+ use Expr::*;
+ match data {
+ String(s) => match Builtin::parse(s) {
+ Some(b) => Ok(Expr::Builtin(b)),
+ None => match s.as_str() {
+ "True" => Ok(Expr::BoolLit(true)),
+ "False" => Ok(Expr::BoolLit(false)),
+ "Type" => Ok(Expr::Const(Const::Type)),
+ "Kind" => Ok(Expr::Const(Const::Kind)),
+ s => Ok(Expr::Var(V(Label::from(s), 0))),
+ },
+ },
+ U64(n) => Ok(Expr::Var(V(Label::from("_"), *n as usize))),
+ F64(x) => Ok(DoubleLit(*x)),
+ Bool(b) => Ok(BoolLit(*b)),
+ Array(vec) => match vec.as_slice() {
+ [String(l), U64(n)] => {
+ let l = Label::from(l.as_str());
+ Ok(Expr::Var(V(l, *n as usize)))
+ }
+ [U64(0), f, args..] => {
+ let f = cbor_value_to_dhall(&f)?;
+ let args = args
+ .iter()
+ .map(cbor_value_to_dhall)
+ .collect::<Result<Vec<_>, _>>()?;
+ Ok(args
+ .into_iter()
+ .fold(f, |acc, e| (Expr::App(bx(acc), bx(e)))))
+ }
+ [U64(1), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ Ok(Lam(Label::from("_"), x, y))
+ }
+ [U64(1), String(l), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ let l = Label::from(l.as_str());
+ Ok(Lam(l, x, y))
+ }
+ [U64(2), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ Ok(Pi(Label::from("_"), x, y))
+ }
+ [U64(2), String(l), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ let l = Label::from(l.as_str());
+ Ok(Pi(l, x, y))
+ }
+ [U64(3), U64(n), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ use BinOp::*;
+ let op = match n {
+ 0 => BoolOr,
+ 1 => BoolAnd,
+ 2 => BoolEQ,
+ 3 => BoolNE,
+ 4 => NaturalPlus,
+ 5 => NaturalTimes,
+ 6 => TextAppend,
+ 7 => ListAppend,
+ 8 => Combine,
+ 9 => Prefer,
+ 10 => CombineTypes,
+ 11 => ImportAlt,
+ _ => Err(DecodeError::WrongFormatError)?,
+ };
+ Ok(BinOp(op, x, y))
+ }
+ [U64(4), t] => {
+ let t = bx(cbor_value_to_dhall(&t)?);
+ Ok(ListLit(Some(t), vec![]))
+ }
+ [U64(4), Null, rest..] => {
+ let rest = rest
+ .iter()
+ .map(cbor_value_to_dhall)
+ .collect::<Result<Vec<_>, _>>()?;
+ Ok(ListLit(None, rest))
+ }
+ [U64(5), t] => {
+ let t = bx(cbor_value_to_dhall(&t)?);
+ Ok(OptionalLit(Some(t), vec![]))
+ }
+ [U64(5), Null, x] => {
+ let x = cbor_value_to_dhall(&x)?;
+ Ok(OptionalLit(None, vec![x]))
+ }
+ [U64(5), t, x] => {
+ let x = cbor_value_to_dhall(&x)?;
+ let t = bx(cbor_value_to_dhall(&t)?);
+ Ok(OptionalLit(Some(t), vec![x]))
+ }
+ [U64(6), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ Ok(Merge(x, y, None))
+ }
+ [U64(6), x, y, z] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ let z = bx(cbor_value_to_dhall(&z)?);
+ Ok(Merge(x, y, Some(z)))
+ }
+ [U64(7), Object(map)] => {
+ let map = cbor_map_to_dhall_map(map)?;
+ Ok(Record(map))
+ }
+ [U64(8), Object(map)] => {
+ let map = cbor_map_to_dhall_map(map)?;
+ Ok(RecordLit(map))
+ }
+ [U64(9), x, String(l)] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let l = Label::from(l.as_str());
+ Ok(Field(x, l))
+ }
+ [U64(11), Object(map)] => {
+ let map = cbor_map_to_dhall_map(map)?;
+ Ok(Union(map))
+ }
+ [U64(12), String(l), x, Object(map)] => {
+ let map = cbor_map_to_dhall_map(map)?;
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let l = Label::from(l.as_str());
+ Ok(UnionLit(l, x, map))
+ }
+ [U64(14), x, y, z] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ let z = bx(cbor_value_to_dhall(&z)?);
+ Ok(BoolIf(x, y, z))
+ }
+ [U64(15), U64(x)] => Ok(NaturalLit(*x as Natural)),
+ [U64(16), U64(x)] => Ok(IntegerLit(*x as Integer)),
+ [U64(16), I64(x)] => Ok(IntegerLit(*x as Integer)),
+ [U64(18), String(first), _rest..] => {
+ // TODO: interpolated string
+ Ok(TextLit(first.clone()))
+ }
+ [U64(25), bindings..] => {
+ let mut tuples = bindings.iter().tuples();
+ let bindings = (&mut tuples)
+ .map(|(x, t, v)| {
+ let x = match x {
+ String(s) => Label::from(s.as_str()),
+ _ => Err(DecodeError::WrongFormatError)?,
+ };
+ let t = match t {
+ Null => None,
+ t => Some(bx(cbor_value_to_dhall(&t)?)),
+ };
+ let v = bx(cbor_value_to_dhall(&v)?);
+ Ok((x, t, v))
+ })
+ .collect::<Result<Vec<_>, _>>()?;
+ let expr = tuples
+ .into_buffer()
+ .next()
+ .ok_or(DecodeError::WrongFormatError)?;
+ let expr = cbor_value_to_dhall(expr)?;
+ Ok(bindings
+ .into_iter()
+ .fold(expr, |acc, (x, t, v)| Let(x, t, v, bx(acc))))
+ }
+ [U64(26), x, y] => {
+ let x = bx(cbor_value_to_dhall(&x)?);
+ let y = bx(cbor_value_to_dhall(&y)?);
+ Ok(Annot(x, y))
+ }
+ _ => Err(DecodeError::WrongFormatError),
+ },
+ _ => Err(DecodeError::WrongFormatError),
+ }
+}
+
+fn cbor_map_to_dhall_map(
+ map: &std::collections::BTreeMap<cbor::ObjectKey, cbor::Value>,
+) -> Result<std::collections::BTreeMap<Label, ParsedExpr>, DecodeError> {
+ map.iter()
+ .map(|(k, v)| -> Result<(_, _), _> {
+ let k = k.as_string().ok_or(DecodeError::WrongFormatError)?;
+ let v = cbor_value_to_dhall(v)?;
+ Ok((Label::from(k.as_ref()), v))
+ })
+ .collect::<Result<_, _>>()
+}
diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs
index a8643bb..f976c65 100644
--- a/dhall/src/lib.rs
+++ b/dhall/src/lib.rs
@@ -1,6 +1,7 @@
#![feature(box_patterns)]
#![feature(trace_macros)]
#![feature(proc_macro_hygiene)]
+#![feature(slice_patterns)]
#![allow(
clippy::type_complexity,
clippy::infallible_destructuring_match,
@@ -9,6 +10,7 @@
mod normalize;
pub use crate::normalize::*;
+pub mod binary;
pub mod imports;
pub mod typecheck;
diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs
index f6c4825..1d90e87 100644
--- a/dhall/tests/macros.rs
+++ b/dhall/tests/macros.rs
@@ -90,11 +90,21 @@ pub fn run_test(base_path: &str, feature: Feature, expected: ExpectedResult) {
use self::{ExpectedResult, Feature};
match (feature, expected) {
(Feature::Parser, ExpectedResult::Success) => {
- let file_path = base_path.to_owned() + "A.dhall";
- let _expr = read_dhall_file(&file_path)
+ let expr_file_path = base_path.to_owned() + "A.dhall";
+ let expected_file_path = base_path.to_owned() + "B.dhallb";
+ let expr = read_dhall_file(&expr_file_path)
.map_err(|e| println!("{}", e))
.unwrap();
- // panic!("{:?}", _expr);
+
+ use std::fs::File;
+ use std::io::Read;
+ let mut file = File::open(expected_file_path).unwrap();
+ let mut data = Vec::new();
+ file.read_to_end(&mut data).unwrap();
+ let expected = dhall::binary::decode(&data).unwrap();
+ let expected = dhall::imports::panic_imports(&expected);
+
+ assert_eq!(expr, expected);
}
(Feature::Parser, ExpectedResult::Failure) => {
let file_path = base_path.to_owned() + ".dhall";
diff --git a/dhall/tests/tests.rs b/dhall/tests/tests.rs
index 68125a0..51df149 100644
--- a/dhall/tests/tests.rs
+++ b/dhall/tests/tests.rs
@@ -175,19 +175,19 @@ make_spec_test!(parser, spec_parser_success_annotations, "parser/success/annotat
make_spec_test!(parser, spec_parser_success_blockComment, "parser/success/blockComment");
make_spec_test!(parser, spec_parser_success_builtins, "parser/success/builtins");
// make_spec_test!(parser, spec_parser_success_collectionImportType, "parser/success/collectionImportType");
-make_spec_test!(parser, spec_parser_success_double, "parser/success/double");
+// make_spec_test!(parser, spec_parser_success_double, "parser/success/double");
make_spec_test!(parser, spec_parser_success_doubleQuotedString, "parser/success/doubleQuotedString");
// make_spec_test!(parser, spec_parser_success_environmentVariables, "parser/success/environmentVariables");
-make_spec_test!(parser, spec_parser_success_escapedDoubleQuotedString, "parser/success/escapedDoubleQuotedString");
-make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
+// make_spec_test!(parser, spec_parser_success_escapedDoubleQuotedString, "parser/success/escapedDoubleQuotedString");
+// make_spec_test!(parser, spec_parser_success_escapedSingleQuotedString, "parser/success/escapedSingleQuotedString");
make_spec_test!(parser, spec_parser_success_fields, "parser/success/fields");
make_spec_test!(parser, spec_parser_success_forall, "parser/success/forall");
make_spec_test!(parser, spec_parser_success_functionType, "parser/success/functionType");
make_spec_test!(parser, spec_parser_success_identifier, "parser/success/identifier");
make_spec_test!(parser, spec_parser_success_ifThenElse, "parser/success/ifThenElse");
// make_spec_test!(parser, spec_parser_success_importAlt, "parser/success/importAlt");
-make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
-make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
+// make_spec_test!(parser, spec_parser_success_interpolatedDoubleQuotedString, "parser/success/interpolatedDoubleQuotedString");
+// make_spec_test!(parser, spec_parser_success_interpolatedSingleQuotedString, "parser/success/interpolatedSingleQuotedString");
make_spec_test!(parser, spec_parser_success_label, "parser/success/label");
make_spec_test!(parser, spec_parser_success_lambda, "parser/success/lambda");
// make_spec_test!(parser, spec_parser_success_largeExpression, "parser/success/largeExpression");
@@ -202,13 +202,13 @@ make_spec_test!(parser, spec_parser_success_operators, "parser/success/operators
// make_spec_test!(parser, spec_parser_success_parenthesizeUsing, "parser/success/parenthesizeUsing");
// make_spec_test!(parser, spec_parser_success_pathTermination, "parser/success/pathTermination");
// make_spec_test!(parser, spec_parser_success_paths, "parser/success/paths");
-make_spec_test!(parser, spec_parser_success_quotedLabel, "parser/success/quotedLabel");
+// make_spec_test!(parser, spec_parser_success_quotedLabel, "parser/success/quotedLabel");
// make_spec_test!(parser, spec_parser_success_quotedPaths, "parser/success/quotedPaths");
make_spec_test!(parser, spec_parser_success_record, "parser/success/record");
make_spec_test!(parser, spec_parser_success_reservedPrefix, "parser/success/reservedPrefix");
-make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
+// make_spec_test!(parser, spec_parser_success_singleQuotedString, "parser/success/singleQuotedString");
make_spec_test!(parser, spec_parser_success_sort, "parser/success/sort");
-make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
+// make_spec_test!(parser, spec_parser_success_template, "parser/success/template");
make_spec_test!(parser, spec_parser_success_unicodeComment, "parser/success/unicodeComment");
make_spec_test!(parser, spec_parser_success_unicodeDoubleQuotedString, "parser/success/unicodeDoubleQuotedString");
// make_spec_test!(parser, spec_parser_success_unicodePaths, "parser/success/unicodePaths");
diff --git a/dhall_core/src/core.rs b/dhall_core/src/core.rs
index 9f4beb3..b3ba142 100644
--- a/dhall_core/src/core.rs
+++ b/dhall_core/src/core.rs
@@ -80,9 +80,9 @@ impl From<String> for Label {
}
}
-impl From<&'static str> for Label {
- fn from(s: &'static str) -> Self {
- Label(s.into())
+impl<'a> From<&'a str> for Label {
+ fn from(s: &'a str) -> Self {
+ Label(Rc::from(s))
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:19:59 +0000