Skip to content

Commit

Permalink
disable trie impl that requires box_syntax feature
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewhammer committed Dec 22, 2019
1 parent a205874 commit 54bfa59
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
6 changes: 5 additions & 1 deletion src/catalog/trie.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ pub trait TrieElim<X>: Debug + Hash + PartialEq + Eq + Clone + 'static {
NameC: FnOnce(&Name, &Self) -> Res;
}

/*
20121221-- requires box_syntax feature
impl<X: Debug + Hash + PartialEq + Eq + Clone + 'static> Trie<X> {
fn mfn(nm: Name, meta: Meta, trie: Self, bs: BS, elt: X, hash: u64) -> Self {
match trie {
Expand Down Expand Up @@ -214,6 +217,7 @@ impl<X: Debug + Hash + PartialEq + Eq + Clone + 'static> Trie<X> {
}
}
}
*/

impl<X: Debug + Hash + PartialEq + Eq + Clone + 'static> TrieIntro<X> for Trie<X> {
fn nil(bs: BS) -> Self {
Expand Down Expand Up @@ -262,7 +266,7 @@ impl<X: Debug + Hash + PartialEq + Eq + Clone + 'static> TrieIntro<X> for Trie<X
fn extend(nm: Name, trie: Self, elt: X) -> Self {
let (nm, nm_) = name_fork(nm);
// let a = Self::root_mfn(nm.clone(), nm_, trie, elt);
let root_mfn_art = put(Self::root_mfn(nm.clone(), nm_, trie, elt));
let root_mfn_art = panic!("todo"); //put(Self::root_mfn(nm.clone(), nm_, trie, elt));
Self::name(nm, Self::art(root_mfn_art))
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ thread_local!(static UNIT_NAME: Name = Name{ hash:0, symbol: Rc::new(NameSym::Un

struct TraceSt { stack:Vec<Box<Vec<reflect::trace::Trace>>>, }

/// When this option is set to some, the engine will record a trace of its DCG effects.
// When this option is set to some, the engine will record a trace of its DCG effects.
thread_local!(static TRACES: RefCell<Option<TraceSt>> = RefCell::new( None ));

fn my_hash<T>(obj: T) -> u64
Expand Down Expand Up @@ -1557,15 +1557,15 @@ impl Adapton for DCG {
}} else { (false, false, None, true, true ) }
;
// - - - - - - - - - -
/// Begin an allocation. Because this allocation may require
/// dirtying some allocation edges. (See value of bit
/// `do_dirty`, which is true when we are overwriting what was
/// once a computation with a value). This allocation may also
/// require dirtying some observers, when the new value is
/// different from the one that they last observed. (Similarly,
/// allocations that allocated a different value need to be
/// dirtied too). Hence, this effect may contain other effects
/// to the DCG, namely, those dirtying steps.
// Begin an allocation. Because this allocation may require
// dirtying some allocation edges. (See value of bit
// `do_dirty`, which is true when we are overwriting what was
// once a computation with a value). This allocation may also
// require dirtying some observers, when the new value is
// different from the one that they last observed. (Similarly,
// allocations that allocated a different value need to be
// dirtied too). Hence, this effect may contain other effects
// to the DCG, namely, those dirtying steps.
// - - - - - - -
dcg_effect_begin!(
reflect::trace::Effect::Alloc(
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1396,8 +1396,8 @@ list.
*/

//#![feature(associated_consts)]
#![feature(box_patterns)]
#![feature(box_syntax)]
//#![feature(box_patterns)]
//#![feature(box_syntax)]

#![crate_name = "adapton"]
#![crate_type = "lib"]
Expand Down

0 comments on commit 54bfa59

Please sign in to comment.