summaryrefslogtreecommitdiff
path: root/dhall/src
diff options
context:
space:
mode:
Diffstat (limited to 'dhall/src')
-rw-r--r--dhall/src/syntax/ast/expr.rs (renamed from dhall/src/syntax/core/expr.rs)0
-rw-r--r--dhall/src/syntax/ast/import.rs (renamed from dhall/src/syntax/core/import.rs)0
-rw-r--r--dhall/src/syntax/ast/label.rs (renamed from dhall/src/syntax/core/label.rs)0
-rw-r--r--dhall/src/syntax/ast/map.rs (renamed from dhall/src/syntax/core/map.rs)0
-rw-r--r--dhall/src/syntax/ast/mod.rs (renamed from dhall/src/syntax/core/mod.rs)0
-rw-r--r--dhall/src/syntax/ast/span.rs (renamed from dhall/src/syntax/core/span.rs)0
-rw-r--r--dhall/src/syntax/ast/text.rs (renamed from dhall/src/syntax/core/text.rs)0
-rw-r--r--dhall/src/syntax/ast/visitor.rs (renamed from dhall/src/syntax/core/visitor.rs)0
-rw-r--r--dhall/src/syntax/mod.rs6
-rw-r--r--dhall/src/syntax/text/parser.rs19
-rw-r--r--dhall/src/syntax/text/printer.rs2
11 files changed, 13 insertions, 14 deletions
diff --git a/dhall/src/syntax/core/expr.rs b/dhall/src/syntax/ast/expr.rs
index 5b9f401..5b9f401 100644
--- a/dhall/src/syntax/core/expr.rs
+++ b/dhall/src/syntax/ast/expr.rs
diff --git a/dhall/src/syntax/core/import.rs b/dhall/src/syntax/ast/import.rs
index da3e99b..da3e99b 100644
--- a/dhall/src/syntax/core/import.rs
+++ b/dhall/src/syntax/ast/import.rs
diff --git a/dhall/src/syntax/core/label.rs b/dhall/src/syntax/ast/label.rs
index 43c3f53..43c3f53 100644
--- a/dhall/src/syntax/core/label.rs
+++ b/dhall/src/syntax/ast/label.rs
diff --git a/dhall/src/syntax/core/map.rs b/dhall/src/syntax/ast/map.rs
index c4c6126..c4c6126 100644
--- a/dhall/src/syntax/core/map.rs
+++ b/dhall/src/syntax/ast/map.rs
diff --git a/dhall/src/syntax/core/mod.rs b/dhall/src/syntax/ast/mod.rs
index 1950154..1950154 100644
--- a/dhall/src/syntax/core/mod.rs
+++ b/dhall/src/syntax/ast/mod.rs
diff --git a/dhall/src/syntax/core/span.rs b/dhall/src/syntax/ast/span.rs
index f9c7008..f9c7008 100644
--- a/dhall/src/syntax/core/span.rs
+++ b/dhall/src/syntax/ast/span.rs
diff --git a/dhall/src/syntax/core/text.rs b/dhall/src/syntax/ast/text.rs
index fb390ee..fb390ee 100644
--- a/dhall/src/syntax/core/text.rs
+++ b/dhall/src/syntax/ast/text.rs
diff --git a/dhall/src/syntax/core/visitor.rs b/dhall/src/syntax/ast/visitor.rs
index b76d037..b76d037 100644
--- a/dhall/src/syntax/core/visitor.rs
+++ b/dhall/src/syntax/ast/visitor.rs
diff --git a/dhall/src/syntax/mod.rs b/dhall/src/syntax/mod.rs
index 6efa9cd..512a026 100644
--- a/dhall/src/syntax/mod.rs
+++ b/dhall/src/syntax/mod.rs
@@ -5,9 +5,9 @@
clippy::type_complexity
)]
-mod core;
-pub use crate::syntax::core::visitor;
-pub use crate::syntax::core::*;
+mod ast;
+pub use crate::syntax::ast::visitor;
+pub use crate::syntax::ast::*;
pub use crate::syntax::text::parser::*;
pub use crate::syntax::text::printer::*;
pub mod binary;
diff --git a/dhall/src/syntax/text/parser.rs b/dhall/src/syntax/text/parser.rs
index f6b6577..617348b 100644
--- a/dhall/src/syntax/text/parser.rs
+++ b/dhall/src/syntax/text/parser.rs
@@ -7,13 +7,12 @@ use pest_consume::{match_nodes, Parser};
use crate::semantics::phase::Normalized;
use crate::syntax;
-use crate::syntax::core;
use crate::syntax::map::{DupTreeMap, DupTreeSet};
use crate::syntax::ExprF::*;
use crate::syntax::{
- FilePath, FilePrefix, Hash, ImportLocation, ImportMode, InterpolatedText,
- InterpolatedTextContents, Label, NaiveDouble, RawExpr, Scheme, Span, URL,
- V,
+ Double, FilePath, FilePrefix, Hash, ImportLocation, ImportMode, Integer,
+ InterpolatedText, InterpolatedTextContents, Label, NaiveDouble, Natural,
+ RawExpr, Scheme, Span, URL, V,
};
// This file consumes the parse tree generated by pest and turns it into
@@ -349,20 +348,20 @@ impl DhallParser {
}
#[alias(double_literal)]
- fn NaN(_input: ParseInput) -> ParseResult<core::Double> {
+ fn NaN(_input: ParseInput) -> ParseResult<Double> {
Ok(std::f64::NAN.into())
}
#[alias(double_literal)]
- fn minus_infinity_literal(_input: ParseInput) -> ParseResult<core::Double> {
+ fn minus_infinity_literal(_input: ParseInput) -> ParseResult<Double> {
Ok(std::f64::NEG_INFINITY.into())
}
#[alias(double_literal)]
- fn plus_infinity_literal(_input: ParseInput) -> ParseResult<core::Double> {
+ fn plus_infinity_literal(_input: ParseInput) -> ParseResult<Double> {
Ok(std::f64::INFINITY.into())
}
#[alias(double_literal)]
- fn numeric_double_literal(input: ParseInput) -> ParseResult<core::Double> {
+ fn numeric_double_literal(input: ParseInput) -> ParseResult<Double> {
let s = input.as_str().trim();
match s.parse::<f64>() {
Ok(x) if x.is_infinite() => Err(input.error(format!(
@@ -374,7 +373,7 @@ impl DhallParser {
}
}
- fn natural_literal(input: ParseInput) -> ParseResult<core::Natural> {
+ fn natural_literal(input: ParseInput) -> ParseResult<Natural> {
input
.as_str()
.trim()
@@ -382,7 +381,7 @@ impl DhallParser {
.map_err(|e| input.error(format!("{}", e)))
}
- fn integer_literal(input: ParseInput) -> ParseResult<core::Integer> {
+ fn integer_literal(input: ParseInput) -> ParseResult<Integer> {
input
.as_str()
.trim()
diff --git a/dhall/src/syntax/text/printer.rs b/dhall/src/syntax/text/printer.rs
index 8df456b..7ccc708 100644
--- a/dhall/src/syntax/text/printer.rs
+++ b/dhall/src/syntax/text/printer.rs
@@ -112,7 +112,7 @@ impl<SE: Display + Clone, E: Display> Display for ExprF<SE, E> {
enum PrintPhase {
Base,
Operator,
- BinOp(core::BinOp),
+ BinOp(ast::BinOp),
App,
Import,
Primitive,