summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock26
-rw-r--r--Cargo.toml4
-rw-r--r--dhall/Cargo.toml2
-rw-r--r--dhall/src/binary.rs4
-rw-r--r--dhall/src/error.rs6
-rw-r--r--dhall/src/expr.rs4
-rw-r--r--dhall/src/imports.rs6
-rw-r--r--dhall/src/normalize.rs8
-rw-r--r--dhall/src/serde.rs2
-rw-r--r--dhall/src/traits/dynamic_type.rs2
-rw-r--r--dhall/src/traits/static_type.rs2
-rw-r--r--dhall/src/typecheck.rs28
-rw-r--r--dhall/tests/traits.rs2
-rw-r--r--dhall_generated_parser/src/lib.rs2
-rw-r--r--dhall_generator/Cargo.toml2
-rw-r--r--dhall_generator/src/derive.rs14
-rw-r--r--dhall_generator/src/quote.rs62
-rw-r--r--dhall_syntax/Cargo.toml (renamed from dhall_core/Cargo.toml)2
-rw-r--r--dhall_syntax/src/context.rs (renamed from dhall_core/src/context.rs)0
-rw-r--r--dhall_syntax/src/core.rs (renamed from dhall_core/src/core.rs)0
-rw-r--r--dhall_syntax/src/import.rs (renamed from dhall_core/src/import.rs)0
-rw-r--r--dhall_syntax/src/label.rs (renamed from dhall_core/src/label.rs)0
-rw-r--r--dhall_syntax/src/lib.rs (renamed from dhall_core/src/lib.rs)0
-rw-r--r--dhall_syntax/src/parser.rs (renamed from dhall_core/src/parser.rs)0
-rw-r--r--dhall_syntax/src/printer.rs (renamed from dhall_core/src/printer.rs)0
-rw-r--r--dhall_syntax/src/text.rs (renamed from dhall_core/src/text.rs)0
-rw-r--r--dhall_syntax/src/visitor.rs (renamed from dhall_core/src/visitor.rs)0
27 files changed, 89 insertions, 89 deletions
diff --git a/Cargo.lock b/Cargo.lock
index ada5ea2..876e97c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -69,8 +69,8 @@ name = "dhall"
version = "0.1.0"
dependencies = [
"bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "dhall_core 0.1.0",
"dhall_generator 0.1.0",
+ "dhall_syntax 0.1.0",
"improved_slice_patterns 2.0.0",
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -81,17 +81,6 @@ dependencies = [
]
[[package]]
-name = "dhall_core"
-version = "0.1.0"
-dependencies = [
- "dhall_generated_parser 0.1.0",
- "improved_slice_patterns 2.0.0",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "dhall_generated_parser"
version = "0.1.0"
dependencies = [
@@ -105,7 +94,7 @@ dependencies = [
name = "dhall_generator"
version = "0.1.0"
dependencies = [
- "dhall_core 0.1.0",
+ "dhall_syntax 0.1.0",
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -113,6 +102,17 @@ dependencies = [
]
[[package]]
+name = "dhall_syntax"
+version = "0.1.0"
+dependencies = [
+ "dhall_generated_parser 0.1.0",
+ "improved_slice_patterns 2.0.0",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "difference"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 0474d20..7153910 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ members = [
"abnf_to_pest",
"dhall",
"dhall_generated_parser",
- "dhall_core",
+ "dhall_syntax",
"dhall_generator",
"improved_slice_patterns",
]
@@ -13,7 +13,7 @@ members = [
# # Parser is super slow when not optimized
# [profile.dev.overrides.dhall_parser]
# opt-level = 3
-# [profile.dev.overrides.dhall_core]
+# [profile.dev.overrides.dhall_syntax]
# opt-level = 3
# [profile.dev.overrides.dhall]
# opt-level = 3
diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml
index 637d511..28123e5 100644
--- a/dhall/Cargo.toml
+++ b/dhall/Cargo.toml
@@ -13,7 +13,7 @@ term-painter = "0.2.3"
serde = { version = "1.0", features = ["derive"] }
serde_cbor = "0.9.0"
improved_slice_patterns = { version = "2.0.0", path = "../improved_slice_patterns" }
-dhall_core = { path = "../dhall_core" }
+dhall_syntax = { path = "../dhall_syntax" }
dhall_generator = { path = "../dhall_generator" }
[dev-dependencies]
diff --git a/dhall/src/binary.rs b/dhall/src/binary.rs
index cadd456..9c31d4c 100644
--- a/dhall/src/binary.rs
+++ b/dhall/src/binary.rs
@@ -1,4 +1,4 @@
-use dhall_core::*;
+use dhall_syntax::*;
use itertools::*;
use serde_cbor::value::value as cbor;
@@ -19,7 +19,7 @@ pub fn decode(data: &[u8]) -> Result<ParsedExpr, DecodeError> {
fn cbor_value_to_dhall(data: &cbor::Value) -> Result<ParsedExpr, DecodeError> {
use cbor::Value::*;
- use dhall_core::{BinOp, Builtin, Const};
+ use dhall_syntax::{BinOp, Builtin, Const};
use ExprF::*;
Ok(rc(match data {
String(s) => match Builtin::parse(s) {
diff --git a/dhall/src/error.rs b/dhall/src/error.rs
index b987165..6ed0bfb 100644
--- a/dhall/src/error.rs
+++ b/dhall/src/error.rs
@@ -4,7 +4,7 @@ pub type Result<T> = std::result::Result<T, Error>;
#[non_exhaustive]
pub enum Error {
IO(std::io::Error),
- Parse(dhall_core::ParseError),
+ Parse(dhall_syntax::ParseError),
Decode(crate::binary::DecodeError),
Resolve(crate::imports::ImportError),
Typecheck(crate::typecheck::TypeError),
@@ -30,8 +30,8 @@ impl From<std::io::Error> for Error {
Error::IO(err)
}
}
-impl From<dhall_core::ParseError> for Error {
- fn from(err: dhall_core::ParseError) -> Error {
+impl From<dhall_syntax::ParseError> for Error {
+ fn from(err: dhall_syntax::ParseError) -> Error {
Error::Parse(err)
}
}
diff --git a/dhall/src/expr.rs b/dhall/src/expr.rs
index 9a161bd..b0b6215 100644
--- a/dhall/src/expr.rs
+++ b/dhall/src/expr.rs
@@ -1,6 +1,6 @@
use crate::imports::ImportRoot;
use crate::normalize::{Thunk, Value};
-use dhall_core::*;
+use dhall_syntax::*;
use std::marker::PhantomData;
macro_rules! derive_other_traits {
@@ -71,7 +71,7 @@ mod typed {
use crate::typecheck::{
TypeError, TypeInternal, TypeMessage, TypecheckContext,
};
- use dhall_core::{Const, Label, SubExpr, V, X};
+ use dhall_syntax::{Const, Label, SubExpr, V, X};
use std::borrow::Cow;
use std::marker::PhantomData;
diff --git a/dhall/src/imports.rs b/dhall/src/imports.rs
index e367725..306d4e6 100644
--- a/dhall/src/imports.rs
+++ b/dhall/src/imports.rs
@@ -1,6 +1,6 @@
use crate::error::Error;
use crate::expr::*;
-use dhall_core::*;
+use dhall_syntax::*;
use std::collections::HashMap;
use std::fs::File;
use std::io::Read;
@@ -31,8 +31,8 @@ fn resolve_import(
import_stack: &ImportStack,
) -> Result<Normalized<'static>, ImportError> {
use self::ImportRoot::*;
- use dhall_core::FilePrefix::*;
- use dhall_core::ImportLocation::*;
+ use dhall_syntax::FilePrefix::*;
+ use dhall_syntax::ImportLocation::*;
let cwd = match root {
LocalDir(cwd) => cwd,
};
diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs
index 9327a34..c64bb4a 100644
--- a/dhall/src/normalize.rs
+++ b/dhall/src/normalize.rs
@@ -2,8 +2,8 @@
use std::collections::BTreeMap;
use std::rc::Rc;
-use dhall_core::context::Context;
-use dhall_core::{
+use dhall_syntax::context::Context;
+use dhall_syntax::{
rc, BinOp, Builtin, Const, ExprF, Integer, InterpolatedText,
InterpolatedTextContents, Label, Natural, SubExpr, V, X,
};
@@ -633,7 +633,7 @@ mod thunk {
OutputSubExpr, Value,
};
use crate::expr::Typed;
- use dhall_core::{Label, V};
+ use dhall_syntax::{Label, V};
use std::cell::{Ref, RefCell};
use std::rc::Rc;
@@ -893,7 +893,7 @@ impl TypeThunk {
}
fn apply_builtin(b: Builtin, args: Vec<Thunk>) -> Value {
- use dhall_core::Builtin::*;
+ use dhall_syntax::Builtin::*;
use Value::*;
// Return Ok((unconsumed args, returned value)), or Err(()) if value could not be produced.
diff --git a/dhall/src/serde.rs b/dhall/src/serde.rs
index 6f143cb..96bc765 100644
--- a/dhall/src/serde.rs
+++ b/dhall/src/serde.rs
@@ -1,7 +1,7 @@
use crate::error::{Error, Result};
use crate::expr::{Normalized, Type};
use crate::traits::Deserialize;
-use dhall_core::*;
+use dhall_syntax::*;
use std::borrow::Cow;
impl<'a, T: serde::Deserialize<'a>> Deserialize<'a> for T {
diff --git a/dhall/src/traits/dynamic_type.rs b/dhall/src/traits/dynamic_type.rs
index 74c2e0a..b8f6f6d 100644
--- a/dhall/src/traits/dynamic_type.rs
+++ b/dhall/src/traits/dynamic_type.rs
@@ -3,7 +3,7 @@ use crate::traits::StaticType;
#[allow(unused_imports)]
use crate::typecheck::{TypeError, TypeMessage, TypecheckContext};
#[allow(unused_imports)]
-use dhall_core::{Const, ExprF};
+use dhall_syntax::{Const, ExprF};
use std::borrow::Cow;
pub trait DynamicType {
diff --git a/dhall/src/traits/static_type.rs b/dhall/src/traits/static_type.rs
index df6a177..6e42da8 100644
--- a/dhall/src/traits/static_type.rs
+++ b/dhall/src/traits/static_type.rs
@@ -1,5 +1,5 @@
use crate::expr::*;
-use dhall_core::*;
+use dhall_syntax::*;
use dhall_generator as dhall;
/// A value that has a statically-known Dhall type.
diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs
index 598ae1f..1683fbf 100644
--- a/dhall/src/typecheck.rs
+++ b/dhall/src/typecheck.rs
@@ -7,9 +7,9 @@ use std::fmt;
use crate::expr::*;
use crate::normalize::{NormalizationContext, Thunk, TypeThunk, Value};
use crate::traits::DynamicType;
-use dhall_core;
-use dhall_core::context::Context;
-use dhall_core::*;
+use dhall_syntax;
+use dhall_syntax::context::Context;
+use dhall_syntax::*;
use dhall_generator as dhall;
use self::TypeMessage::*;
@@ -113,7 +113,7 @@ impl TypeThunk {
}
}
-/// A semantic type. This is partially redundant with `dhall_core::Expr`, on purpose. `TypeInternal` should
+/// A semantic type. This is partially redundant with `dhall_syntax::Expr`, on purpose. `TypeInternal` should
/// be limited to syntactic expressions: either written by the user or meant to be printed.
/// The rule is the following: we must _not_ construct values of type `Expr` while typechecking,
/// but only construct `TypeInternal`s.
@@ -245,7 +245,7 @@ impl PartialEq for TypecheckContext {
impl Eq for TypecheckContext {}
fn function_check(a: Const, b: Const) -> Result<Const, ()> {
- use dhall_core::Const::*;
+ use dhall_syntax::Const::*;
match (a, b) {
(_, Type) => Ok(Type),
(Kind, Kind) => Ok(Kind),
@@ -279,7 +279,7 @@ where
T: Borrow<Type<'static>>,
U: Borrow<Type<'static>>,
{
- use dhall_core::ExprF::*;
+ use dhall_syntax::ExprF::*;
fn go<'a, S, T>(
ctx: &mut Vec<(&'a Label, &'a Label)>,
el: &'a SubExpr<S, X>,
@@ -368,7 +368,7 @@ fn type_of_const<'a>(c: Const) -> Result<Type<'a>, TypeError> {
}
fn type_of_builtin<N, E>(b: Builtin) -> Expr<N, E> {
- use dhall_core::Builtin::*;
+ use dhall_syntax::Builtin::*;
match b {
Bool | Natural | Integer | Double | Text => dhall::expr!(Type),
List | Optional => dhall::expr!(
@@ -464,7 +464,7 @@ macro_rules! ensure_equal {
macro_rules! ensure_simple_type {
($x:expr, $err:expr $(,)*) => {{
match $x.get_type()?.as_const() {
- Some(dhall_core::Const::Type) => {}
+ Some(dhall_syntax::Const::Type) => {}
_ => return Err($err),
}
}};
@@ -553,7 +553,7 @@ impl TypeIntermediate {
}
}
// An empty record type has type Type
- let k = k.unwrap_or(dhall_core::Const::Type);
+ let k = k.unwrap_or(dhall_syntax::Const::Type);
Typed::from_thunk_and_type(
Value::RecordType(
@@ -587,7 +587,7 @@ impl TypeIntermediate {
// An empty union type has type Type;
// an union type with only unary variants also has type Type
- let k = k.unwrap_or(dhall_core::Const::Type);
+ let k = k.unwrap_or(dhall_syntax::Const::Type);
Typed::from_thunk_and_type(
Value::UnionType(
@@ -664,7 +664,7 @@ fn type_with(
ctx: &TypecheckContext,
e: SubExpr<X, Normalized<'static>>,
) -> Result<Typed<'static>, TypeError> {
- use dhall_core::ExprF::*;
+ use dhall_syntax::ExprF::*;
use Ret::*;
let ret = match e.as_ref() {
@@ -738,9 +738,9 @@ fn type_last_layer(
ctx: &TypecheckContext,
e: ExprF<Typed<'static>, Label, X, Normalized<'static>>,
) -> Result<Ret, TypeError> {
- use dhall_core::BinOp::*;
- use dhall_core::Builtin::*;
- use dhall_core::ExprF::*;
+ use dhall_syntax::BinOp::*;
+ use dhall_syntax::Builtin::*;
+ use dhall_syntax::ExprF::*;
let mkerr = |msg: TypeMessage<'static>| TypeError::new(ctx, msg);
use Ret::*;
diff --git a/dhall/tests/traits.rs b/dhall/tests/traits.rs
index a7cd530..e26a6c7 100644
--- a/dhall/tests/traits.rs
+++ b/dhall/tests/traits.rs
@@ -1,6 +1,6 @@
#![feature(proc_macro_hygiene)]
use dhall::de::SimpleStaticType;
-use dhall_core::{SubExpr, X};
+use dhall_syntax::{SubExpr, X};
use dhall_generator;
#[test]
diff --git a/dhall_generated_parser/src/lib.rs b/dhall_generated_parser/src/lib.rs
index 527e657..280b75e 100644
--- a/dhall_generated_parser/src/lib.rs
+++ b/dhall_generated_parser/src/lib.rs
@@ -6,7 +6,7 @@
//! [dhall-rust]: https://github.com/Nadrieril/dhall-rust
// This crate only contains the grammar-generated parser. The rest of the
-// parser is in dhall_core. This separation is because compiling the
+// parser is in dhall_syntax. This separation is because compiling the
// grammar-generated parser is extremely slow.
// See the https://pest.rs documentation for details on what this crate contains.
// The pest file is auto-generated and is located at ./dhall.pest.
diff --git a/dhall_generator/Cargo.toml b/dhall_generator/Cargo.toml
index d58e2eb..8a6b6e2 100644
--- a/dhall_generator/Cargo.toml
+++ b/dhall_generator/Cargo.toml
@@ -14,4 +14,4 @@ itertools = "0.8.0"
quote = "0.6.11"
proc-macro2 = "0.4.27"
syn = "0.15.29"
-dhall_core = { path = "../dhall_core" }
+dhall_syntax = { path = "../dhall_syntax" }
diff --git a/dhall_generator/src/derive.rs b/dhall_generator/src/derive.rs
index 852ffc8..bcefb17 100644
--- a/dhall_generator/src/derive.rs
+++ b/dhall_generator/src/derive.rs
@@ -1,5 +1,5 @@
extern crate proc_macro;
-// use dhall_core::*;
+// use dhall_syntax::*;
use proc_macro::TokenStream;
use quote::{quote, quote_spanned};
use syn::spanned::Spanned;
@@ -51,15 +51,15 @@ fn derive_for_struct(
let fields = fields
.into_iter()
.map(|(name, ty)| {
- let name = dhall_core::Label::from(name);
+ let name = dhall_syntax::Label::from(name);
constraints.push(ty.clone());
let ty = get_simple_static_type(ty);
(name, quote!(#ty.into()))
})
.collect();
let record =
- crate::quote::quote_exprf(dhall_core::ExprF::RecordType(fields));
- Ok(quote! { dhall_core::rc(#record) })
+ crate::quote::quote_exprf(dhall_syntax::ExprF::RecordType(fields));
+ Ok(quote! { dhall_syntax::rc(#record) })
}
fn derive_for_enum(
@@ -70,7 +70,7 @@ fn derive_for_enum(
.variants
.iter()
.map(|v| {
- let name = dhall_core::Label::from(v.ident.to_string());
+ let name = dhall_syntax::Label::from(v.ident.to_string());
match &v.fields {
syn::Fields::Unit => Ok((name, None)),
syn::Fields::Unnamed(fields) if fields.unnamed.is_empty() => {
@@ -95,8 +95,8 @@ fn derive_for_enum(
.collect::<Result<_, Error>>()?;
let union =
- crate::quote::quote_exprf(dhall_core::ExprF::UnionType(variants));
- Ok(quote! { dhall_core::rc(#union) })
+ crate::quote::quote_exprf(dhall_syntax::ExprF::UnionType(variants));
+ Ok(quote! { dhall_syntax::rc(#union) })
}
pub fn derive_simple_static_type_inner(
diff --git a/dhall_generator/src/quote.rs b/dhall_generator/src/quote.rs
index c588eda..c2323fa 100644
--- a/dhall_generator/src/quote.rs
+++ b/dhall_generator/src/quote.rs
@@ -1,6 +1,6 @@
extern crate proc_macro;
-use dhall_core::context::Context;
-use dhall_core::*;
+use dhall_syntax::context::Context;
+use dhall_syntax::*;
use proc_macro2::TokenStream;
use quote::quote;
use std::collections::BTreeMap;
@@ -31,62 +31,62 @@ pub fn quote_exprf<TS>(expr: ExprF<TS, Label, X, X>) -> TokenStream
where
TS: quote::ToTokens + std::fmt::Debug,
{
- use dhall_core::ExprF::*;
+ use dhall_syntax::ExprF::*;
match expr {
Var(_) => unreachable!(),
Pi(x, t, b) => {
let x = quote_label(&x);
- quote! { dhall_core::ExprF::Pi(#x, #t, #b) }
+ quote! { dhall_syntax::ExprF::Pi(#x, #t, #b) }
}
Lam(x, t, b) => {
let x = quote_label(&x);
- quote! { dhall_core::ExprF::Lam(#x, #t, #b) }
+ quote! { dhall_syntax::ExprF::Lam(#x, #t, #b) }
}
App(f, a) => {
- quote! { dhall_core::ExprF::App(#f, #a) }
+ quote! { dhall_syntax::ExprF::App(#f, #a) }
}
Annot(x, t) => {
- quote! { dhall_core::ExprF::Annot(#x, #t) }
+ quote! { dhall_syntax::ExprF::Annot(#x, #t) }
}
Const(c) => {
let c = quote_const(c);
- quote! { dhall_core::ExprF::Const(#c) }
+ quote! { dhall_syntax::ExprF::Const(#c) }
}
Builtin(b) => {
let b = quote_builtin(b);
- quote! { dhall_core::ExprF::Builtin(#b) }
+ quote! { dhall_syntax::ExprF::Builtin(#b) }
}
BinOp(o, a, b) => {
let o = quote_binop(o);
- quote! { dhall_core::ExprF::BinOp(#o, #a, #b) }
+ quote! { dhall_syntax::ExprF::BinOp(#o, #a, #b) }
}
NaturalLit(n) => {
- quote! { dhall_core::ExprF::NaturalLit(#n) }
+ quote! { dhall_syntax::ExprF::NaturalLit(#n) }
}
BoolLit(b) => {
- quote! { dhall_core::ExprF::BoolLit(#b) }
+ quote! { dhall_syntax::ExprF::BoolLit(#b) }
}
SomeLit(x) => {
- quote! { dhall_core::ExprF::SomeLit(#x) }
+ quote! { dhall_syntax::ExprF::SomeLit(#x) }
}
EmptyListLit(t) => {
- quote! { dhall_core::ExprF::EmptyListLit(#t) }
+ quote! { dhall_syntax::ExprF::EmptyListLit(#t) }
}
NEListLit(es) => {
let es = quote_vec(es);
- quote! { dhall_core::ExprF::NEListLit(#es) }
+ quote! { dhall_syntax::ExprF::NEListLit(#es) }
}
RecordType(m) => {
let m = quote_map(m);
- quote! { dhall_core::ExprF::RecordType(#m) }
+ quote! { dhall_syntax::ExprF::RecordType(#m) }
}
RecordLit(m) => {
let m = quote_map(m);
- quote! { dhall_core::ExprF::RecordLit(#m) }
+ quote! { dhall_syntax::ExprF::RecordLit(#m) }
}
UnionType(m) => {
let m = quote_opt_map(m);
- quote! { dhall_core::ExprF::UnionType(#m) }
+ quote! { dhall_syntax::ExprF::UnionType(#m) }
}
e => unimplemented!("{:?}", e),
}
@@ -98,7 +98,7 @@ fn quote_subexpr(
expr: &SubExpr<X, X>,
ctx: &Context<Label, ()>,
) -> TokenStream {
- use dhall_core::ExprF::*;
+ use dhall_syntax::ExprF::*;
match expr.as_ref().map_ref_with_special_handling_of_binders(
|e| quote_subexpr(e, ctx),
|l, e| quote_subexpr(e, &ctx.insert(l.clone(), ())),
@@ -111,8 +111,8 @@ fn quote_subexpr(
// Non-free variable; interpolates as itself
Some(()) => {
let s: String = s.into();
- let var = quote! { dhall_core::V(#s.into(), #n) };
- rc(quote! { dhall_core::ExprF::Var(#var) })
+ let var = quote! { dhall_syntax::V(#s.into(), #n) };
+ rc(quote! { dhall_syntax::ExprF::Var(#var) })
}
// Free variable; interpolates as a rust variable
None => {
@@ -120,7 +120,7 @@ fn quote_subexpr(
// TODO: insert appropriate shifts ?
let v: TokenStream = s.parse().unwrap();
quote! { {
- let x: dhall_core::SubExpr<_, _> = #v.clone();
+ let x: dhall_syntax::SubExpr<_, _> = #v.clone();
x
} }
}
@@ -133,7 +133,7 @@ fn quote_subexpr(
// Returns an expression of type Expr<_, _>. Expects interpolated variables
// to be of type SubExpr<_, _>.
fn quote_expr(expr: &Expr<X, X>, ctx: &Context<Label, ()>) -> TokenStream {
- use dhall_core::ExprF::*;
+ use dhall_syntax::ExprF::*;
match expr.map_ref_with_special_handling_of_binders(
|e| quote_subexpr(e, ctx),
|l, e| quote_subexpr(e, &ctx.insert(l.clone(), ())),
@@ -146,8 +146,8 @@ fn quote_expr(expr: &Expr<X, X>, ctx: &Context<Label, ()>) -> TokenStream {
// Non-free variable; interpolates as itself
Some(()) => {
let s: String = s.into();
- let var = quote! { dhall_core::V(#s.into(), #n) };
- quote! { dhall_core::ExprF::Var(#var) }
+ let var = quote! { dhall_syntax::V(#s.into(), #n) };
+ quote! { dhall_syntax::ExprF::Var(#var) }
}
// Free variable; interpolates as a rust variable
None => {
@@ -155,7 +155,7 @@ fn quote_expr(expr: &Expr<X, X>, ctx: &Context<Label, ()>) -> TokenStream {
// TODO: insert appropriate shifts ?
let v: TokenStream = s.parse().unwrap();
quote! { {
- let x: dhall_core::SubExpr<_, _> = #v.clone();
+ let x: dhall_syntax::SubExpr<_, _> = #v.clone();
x.unroll()
} }
}
@@ -166,24 +166,24 @@ fn quote_expr(expr: &Expr<X, X>, ctx: &Context<Label, ()>) -> TokenStream {
}
fn quote_builtin(b: Builtin) -> TokenStream {
- format!("dhall_core::Builtin::{:?}", b).parse().unwrap()
+ format!("dhall_syntax::Builtin::{:?}", b).parse().unwrap()
}
fn quote_const(c: Const) -> TokenStream {
- format!("dhall_core::Const::{:?}", c).parse().unwrap()
+ format!("dhall_syntax::Const::{:?}", c).parse().unwrap()
}
fn quote_binop(b: BinOp) -> TokenStream {
- format!("dhall_core::BinOp::{:?}", b).parse().unwrap()
+ format!("dhall_syntax::BinOp::{:?}", b).parse().unwrap()
}
fn quote_label(l: &Label) -> TokenStream {
let l = String::from(l);
- quote! { dhall_core::Label::from(#l) }
+ quote! { dhall_syntax::Label::from(#l) }
}
fn rc(x: TokenStream) -> TokenStream {
- quote! { dhall_core::rc(#x) }
+ quote! { dhall_syntax::rc(#x) }
}
fn quote_opt<TS>(x: Option<TS>) -> TokenStream
diff --git a/dhall_core/Cargo.toml b/dhall_syntax/Cargo.toml
index 476b9fa..3e32930 100644
--- a/dhall_core/Cargo.toml
+++ b/dhall_syntax/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "dhall_core"
+name = "dhall_syntax"
version = "0.1.0"
authors = ["NanoTech <nanotech@nanotechcorp.net>", "Nadrieril <nadrieril@users.noreply.github.com>"]
license = "BSD-2-Clause"
diff --git a/dhall_core/src/context.rs b/dhall_syntax/src/context.rs
index 55bfff5..55bfff5 100644
--- a/dhall_core/src/context.rs
+++ b/dhall_syntax/src/context.rs
diff --git a/dhall_core/src/core.rs b/dhall_syntax/src/core.rs
index 3db07dd..3db07dd 100644
--- a/dhall_core/src/core.rs
+++ b/dhall_syntax/src/core.rs
diff --git a/dhall_core/src/import.rs b/dhall_syntax/src/import.rs
index 00f293c..00f293c 100644
--- a/dhall_core/src/import.rs
+++ b/dhall_syntax/src/import.rs
diff --git a/dhall_core/src/label.rs b/dhall_syntax/src/label.rs
index 43c3f53..43c3f53 100644
--- a/dhall_core/src/label.rs
+++ b/dhall_syntax/src/label.rs
diff --git a/dhall_core/src/lib.rs b/dhall_syntax/src/lib.rs
index 3db8222..3db8222 100644
--- a/dhall_core/src/lib.rs
+++ b/dhall_syntax/src/lib.rs
diff --git a/dhall_core/src/parser.rs b/dhall_syntax/src/parser.rs
index 12383d4..12383d4 100644
--- a/dhall_core/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
diff --git a/dhall_core/src/printer.rs b/dhall_syntax/src/printer.rs
index 704000a..704000a 100644
--- a/dhall_core/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
diff --git a/dhall_core/src/text.rs b/dhall_syntax/src/text.rs
index 83643d9..83643d9 100644
--- a/dhall_core/src/text.rs
+++ b/dhall_syntax/src/text.rs
diff --git a/dhall_core/src/visitor.rs b/dhall_syntax/src/visitor.rs
index caaefce..caaefce 100644
--- a/dhall_core/src/visitor.rs
+++ b/dhall_syntax/src/visitor.rs
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 00:22:28 +0000