greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Address some review comments for #149.

Browse source
This commit is contained in:
Richard Newman 2017-01-11 12:08:45 -08:00
parent dac3a97962
commit f12fbf2388
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edn/Cargo.toml
View file

@ -4,8 +4,8 @@ version = "0.1.0"
authors = ["Joe Walker <jwalker@mozilla.com>"] authors = ["Joe Walker <jwalker@mozilla.com>"]
license = "Apache-2.0" license = "Apache-2.0"
repository = "https://github.com/mozilla/datomish" repository = "https://github.com/mozilla/mentat"
description = "EDN Parser for Datomish" description = "EDN parser for Project Mentat"
build = "build.rs" build = "build.rs"
readme = "./README.md" readme = "./README.md"

2
edn/README.md
View file

@ -1,2 +1,2 @@
# barnardsstar # barnardsstar
An experimental EDN parser for Datomish An experimental EDN parser for Project Mentat.

2
edn/src/edn.rustpeg
View file

@ -1,3 +1,5 @@
/* vim: set filetype=rust.rustpeg */
// Copyright 2016 Mozilla // Copyright 2016 Mozilla
// //
// Licensed under the Apache License, Version 2.0 (the "License"); you may not use // Licensed under the Apache License, Version 2.0 (the "License"); you may not use

5
edn/src/lib.rs
View file

@ -13,12 +13,9 @@
extern crate ordered_float; extern crate ordered_float;
extern crate num; extern crate num;
pub mod keyword;
pub mod types; pub mod types;
pub mod parse { pub mod parse {
include!(concat!(env!("OUT_DIR"), "/edn.rs")); include!(concat!(env!("OUT_DIR"), "/edn.rs"));
} }
fn main() {
println!("Use cargo test");
}

8
edn/tests/tests.rs
View file

@ -8,7 +8,7 @@
// CONDITIONS OF ANY KIND, either express or implied. See the License for the // CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License. // specific language governing permissions and limitations under the License.
extern crate datomish_edn; extern crate edn;
extern crate num; extern crate num;
extern crate ordered_float; extern crate ordered_float;
@ -17,8 +17,8 @@ use std::iter::FromIterator;
use num::bigint::ToBigInt; use num::bigint::ToBigInt;
use num::traits::{Zero, One}; use num::traits::{Zero, One};
use ordered_float::OrderedFloat; use ordered_float::OrderedFloat;
use datomish_edn::types::Value::*; use edn::types::Value::*;
use datomish_edn::parse::*; use edn::parse::*;
#[test] #[test]
fn test_nil() { fn test_nil() {
@ -355,7 +355,7 @@ fn test_map() {
assert!(map("#{1 #{2 nil} \"hi\"").is_err()); assert!(map("#{1 #{2 nil} \"hi\"").is_err());
} }
/// The test_query_* functions contain the queries taken from the old clojure datomish. /// The test_query_* functions contain the queries taken from the old Clojure implementation of Mentat.
/// 2 changes have been applied, which should be checked and maybe fixed /// 2 changes have been applied, which should be checked and maybe fixed
/// TODO: Decide if these queries should be placed in a vector wrapper. Is that implied? /// TODO: Decide if these queries should be placed in a vector wrapper. Is that implied?
/// Secondly, see note in test_query_starred_pages on the use of ' /// Secondly, see note in test_query_starred_pages on the use of '