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

fail on parse error invoked by read/1

Browse Source
This commit is contained in:
Mark Thom
2018-08-04 14:56:38 -06:00
parent cf82accc4b
commit ae11e82040
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/prolog/ast.rs
View File

@@ -813,7 +813,7 @@ pub enum ClauseType {
CallN, CallN,
Inlined(InlinedClauseType), Inlined(InlinedClauseType),
Named(ClauseName, CodeIndex), Named(ClauseName, CodeIndex),
Op(ClauseName, Fixity, CodeIndex), Op(ClauseName, Fixity, CodeIndex),
System(SystemClauseType) System(SystemClauseType)
} }
@@ -862,7 +862,7 @@ impl ClauseName {
&ClauseName::User(ref name) => name.as_ref() &ClauseName::User(ref name) => name.as_ref()
} }
} }
pub fn defrock_brackets(self) -> Self { pub fn defrock_brackets(self) -> Self {
fn defrock_brackets(s: &str) -> &str { fn defrock_brackets(s: &str) -> &str {
if s.starts_with('(') && s.ends_with(')') { if s.starts_with('(') && s.ends_with(')') {
@@ -1019,7 +1019,7 @@ pub enum TermRef<'a> {
Var(Level, &'a Cell<VarReg>, Rc<Var>) Var(Level, &'a Cell<VarReg>, Rc<Var>)
} }
impl<'a> TermRef<'a> { impl<'a> TermRef<'a> {
pub fn level(self) -> Level { pub fn level(self) -> Level {
match self { match self {
TermRef::AnonVar(lvl) TermRef::AnonVar(lvl)
@@ -1600,7 +1600,10 @@ impl CodePtr {
#[derive(Clone, PartialEq)] #[derive(Clone, PartialEq)]
pub enum LocalCodePtr { pub enum LocalCodePtr {
DirEntry(usize, ClauseName), // offset, resident module name. DirEntry(usize, ClauseName), // offset, resident module name.
TopLevel(usize, usize) // chunk_num, offset. TopLevel(usize, usize), // chunk_num, offset.
// DynamicModuleCall(ClauseName, ClauseName, usize)
// module name, predicate name and arity.
// used for internal, dynamic module calls.
} }
impl LocalCodePtr { impl LocalCodePtr {