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

add support for char codes

Browse Source
This commit is contained in:
Mark Thom
2019-03-31 19:48:40 -06:00
parent a97e8a4b5c
commit a15ebd20c1
6 changed files with 225 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/prolog/heap_print.rs
View File

@@ -1,4 +1,5 @@
use prolog_parser::ast::*;
use prolog_parser::string_list::*;
use prolog::clause_types::*;
use prolog::heap_iter::*;
@@ -652,37 +653,46 @@ impl<'a, Outputter: HCValueOutputter> HCPrinter<'a, Outputter>
} else {
self.print_char(c);
},
Constant::CharCode(c) =>
self.append_str(&format!("{}", c)),
Constant::EmptyList =>
self.append_str("[]"),
Constant::Number(n) =>
self.print_number(n, op),
Constant::String(s) =>
if self.machine_st.machine_flags().double_quotes.is_chars() {
if !s.is_empty() {
if self.ignore_ops {
self.format_struct(2, clause_name!("."));
} else {
self.push_list();
}
} else if s.is_expandable() {
if !self.at_cdr(" | _") {
self.push_char('_');
}
} else if !self.at_cdr("") {
self.append_str("[]");
}
} else { // for now, == DoubleQuotes::Atom
let borrowed_str = s.borrow();
self.push_char('"');
self.append_str(&borrowed_str[s.cursor() ..]);
self.push_char('"');
},
self.print_string(s),
Constant::Usize(i) =>
self.append_str(&format!("u{}", i))
}
}
fn print_string(&mut self, s: StringList) {
match self.machine_st.machine_flags().double_quotes {
DoubleQuotes::Chars | DoubleQuotes::Codes => {
if !s.is_empty() {
if self.ignore_ops {
self.format_struct(2, clause_name!("."));
} else {
self.push_list();
}
} else if s.is_expandable() {
if !self.at_cdr(" | _") {
self.push_char('_');
}
} else if !self.at_cdr("") {
self.append_str("[]");
}
},
DoubleQuotes::Atom => {
let borrowed_str = s.borrow();
self.push_char('"');
self.append_str(&borrowed_str[s.cursor() ..]);
self.push_char('"');
}
}
}
fn push_list(&mut self) {
let cell = Rc::new(Cell::new(true));