rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add structural tests for partial strings, rename ast.rs

Browse Source
This commit is contained in:
Mark Thom
2018-09-04 21:20:45 -06:00
parent 9713286023
commit 33d1a7c701
27 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/machine/machine_errors.rs
View File

@@ -1,6 +1,6 @@
use prolog_parser::ast::*;
use prolog::ast::*;
use prolog::instructions::*;
use prolog::machine::machine_state::*;
use prolog::num::bigint::BigInt;

2
src/prolog/machine/machine_state.rs
View File

@@ -1,7 +1,7 @@
use prolog_parser::ast::*;
use prolog_parser::tabled_rc::*;
use prolog::ast::*;
use prolog::instructions::*;
use prolog::and_stack::*;
use prolog::copier::*;
use prolog::heap_print::*;

18
src/prolog/machine/machine_state_impl.rs
View File

@@ -1,7 +1,7 @@
use prolog_parser::ast::*;
use prolog_parser::string_list::StringList;
use prolog::ast::*;
use prolog::instructions::*;
use prolog::and_stack::*;
use prolog::copier::*;
use prolog::heap_iter::*;
@@ -1528,10 +1528,22 @@ impl MachineState {
return Ordering::Greater,
(HeapCellValue::Addr(Addr::Con(Constant::String(_))),
HeapCellValue::Addr(Addr::Con(Constant::Number(_)))) =>
return Ordering::Greater,
return Ordering::Greater,
(HeapCellValue::Addr(Addr::Con(Constant::String(s1))),
HeapCellValue::Addr(Addr::Con(Constant::String(s2)))) =>
return s1.cmp(&s2),
return if s1.is_expandable() {
if s2.is_expandable() {
s1.cmp(&s2)
} else {
Ordering::Greater
}
} else {
if s2.is_expandable() {
Ordering::Less
} else {
s1.cmp(&s2)
}
},
(HeapCellValue::Addr(Addr::Con(Constant::String(_))), _) =>
return Ordering::Less,
(HeapCellValue::Addr(Addr::Con(Constant::Atom(..))),

2
src/prolog/machine/mod.rs
View File

@@ -1,7 +1,7 @@
use prolog_parser::ast::*;
use prolog_parser::tabled_rc::*;
use prolog::ast::*;
use prolog::instructions::*;
use prolog::compile::*;
use prolog::heap_print::*;

2
src/prolog/machine/system_calls.rs
View File

@@ -1,6 +1,6 @@
use prolog_parser::ast::*;
use prolog::ast::*;
use prolog::instructions::*;
use prolog::machine::machine_errors::*;
use prolog::machine::machine_state::*;
use prolog::num::{ToPrimitive, Zero};