1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
//! Term and primary parsing: the precedence-climbing levels (700 → 200),
//! prefix operators, parenthesized control constructs, and list syntax.
//! Ported from patch-prolog's `parser.rs`. Operator-name lookups defer to
//! [`super::operators`].
use super::Parser;
use super::operators;
use crate::parse_error::ParseError;
use crate::tokenizer::TokenKind;
use plg_shared::{Span, Term};
impl Parser<'_> {
/// Parse a term at the top level (precedence 700 — non-associative comparison/is level).
pub(super) fn parse_term(&mut self) -> Result<Term, ParseError> {
self.parse_expr_700()
}
/// Precedence 700: non-associative operators (is, =, \=, <, >, =<, >=, =:=, =\=)
fn parse_expr_700(&mut self) -> Result<Term, ParseError> {
let left = self.parse_expr_500()?;
if let Some(op) = self.match_op_700() {
let right = self.parse_expr_500()?;
Ok(self.build_binop(&op, left, right))
} else {
Ok(left)
}
}
fn match_op_700(&mut self) -> Option<String> {
let kind = self.current_kind()?;
// Word operators (`@<`, `=..`, ...) arrive as `Atom` tokens.
if let TokenKind::Atom(s) = kind {
if let Some(op) = operators::word_op_700(s) {
self.advance();
return Some(op.to_string());
}
return None;
}
let op = operators::op_700(kind)?;
self.advance();
Some(op.to_string())
}
/// Precedence 500: left-associative (+, -, /\, \/, xor — all yfx).
fn parse_expr_500(&mut self) -> Result<Term, ParseError> {
let mut left = self.parse_expr_400()?;
while let Some(op) = self.current_kind().and_then(operators::op_500) {
let op = op.to_string();
self.advance();
let right = self.parse_expr_400()?;
left = self.build_binop(&op, left, right);
}
Ok(left)
}
/// Precedence 400: left-associative (*, /, //, mod, rem, div, <<, >> — all yfx).
fn parse_expr_400(&mut self) -> Result<Term, ParseError> {
let mut left = self.parse_expr_200()?;
while let Some(op) = self.current_kind().and_then(operators::op_400) {
let op = op.to_string();
self.advance();
let right = self.parse_expr_200()?;
left = self.build_binop(&op, left, right);
}
Ok(left)
}
/// Precedence 200: `**` (xfx, non-associative), `^` (xfy, right-assoc),
/// `:` (xfy, right-assoc). Issue #29.
fn parse_expr_200(&mut self) -> Result<Term, ParseError> {
let left = self.parse_primary()?;
match self.current_kind() {
// xfx — no chaining: RHS is just a primary, not parse_expr_200.
Some(TokenKind::Pow) => {
self.advance();
let right = self.parse_primary()?;
Ok(self.build_binop("**", left, right))
}
// xfy — right-associative: recurse into parse_expr_200.
Some(TokenKind::Caret) => {
self.advance();
let right = self.parse_expr_200()?;
Ok(self.build_binop("^", left, right))
}
Some(TokenKind::Colon) => {
self.advance();
let right = self.parse_expr_200()?;
Ok(self.build_binop(":", left, right))
}
_ => Ok(left),
}
}
fn build_binop(&mut self, op: &str, left: Term, right: Term) -> Term {
let functor = self.interner.intern(op);
Term::Compound {
functor,
args: vec![left, right],
}
}
/// Issue #19 — recognize operator tokens as bare atoms in term position.
/// Returns the atom name when the *current* token is one of the listed
/// operators AND the *next* token is a closing context (`)`, `]`, `,`,
/// `|`, `.`, EOF). The closing-context check is what keeps `1 + 2` from
/// being misread (there `+` is preceded by a primary and is at infix
/// position, not at primary start).
fn operator_as_atom_lookahead(&self) -> Option<&'static str> {
let name = operators::op_as_atom(self.current_kind()?)?;
match self.tokens.get(self.pos + 1).map(|t| &t.kind) {
Some(TokenKind::RParen)
| Some(TokenKind::RBracket)
| Some(TokenKind::Comma)
| Some(TokenKind::Pipe)
| Some(TokenKind::Dot)
| Some(TokenKind::Eof)
| None => Some(name),
_ => None,
}
}
fn parse_primary(&mut self) -> Result<Term, ParseError> {
// Issue #19: an operator token at the start of a primary, immediately
// followed by a "closing context" token, reads as the atom for that
// operator. Handles `p(+)`, `[<, >]`, `X = (mod)`, `=..` round-trips,
// etc., without breaking `1 + 2` (where `+` appears at infix
// position, not primary).
if let Some(name) = self.operator_as_atom_lookahead() {
self.advance();
let id = self.interner.intern(name);
return Ok(Term::Atom(id));
}
match self.current_kind().cloned() {
Some(TokenKind::Integer(n)) => {
self.advance();
Ok(Term::Integer(n))
}
Some(TokenKind::Float(f)) => {
self.advance();
Ok(Term::Float(f))
}
Some(TokenKind::Variable(ref name)) => {
let name = name.clone();
self.advance();
Ok(self.intern_variable(name))
}
Some(TokenKind::Atom(ref name)) => {
let name = name.clone();
// Capture the atom token's start/end for the call-site span
// before advancing past it.
let (lo, atom_hi) = self.current().map(|t| (t.lo, t.hi)).unwrap_or((0, 0));
self.advance();
// Check if followed by '(' — compound term
// The call-site span underlines just the functor name (not
// its args), so squiggles land tightly on the predicate name.
let span = Span::new(0, lo, atom_hi);
if self.current_kind() == Some(&TokenKind::LParen) {
self.advance(); // skip (
let args = self.parse_arg_list()?;
self.expect(&TokenKind::RParen)?;
let functor = self.interner.intern(&name);
let arity = args.len();
self.record_call_site(functor, arity, span);
Ok(Term::Compound { functor, args })
} else {
let id = self.interner.intern(&name);
self.record_call_site(id, 0, span);
Ok(Term::Atom(id))
}
}
Some(TokenKind::LParen) => {
self.advance();
let term = self.parse_paren_body()?;
self.expect(&TokenKind::RParen)?;
Ok(term)
}
Some(TokenKind::Minus) => {
self.advance();
let operand = self.parse_primary()?;
// Optimize: if operand is a literal number, negate it directly
match operand {
Term::Integer(n) => Ok(Term::Integer(-n)),
Term::Float(f) => Ok(Term::Float(-f)),
_ => {
let functor = self.interner.intern("-");
Ok(Term::Compound {
functor,
args: vec![operand],
})
}
}
}
// Issue #28: ISO `+` (fy 200) — unary plus, folded for literal numbers.
Some(TokenKind::Plus) => {
self.advance();
let operand = self.parse_primary()?;
match operand {
Term::Integer(_) | Term::Float(_) => Ok(operand),
_ => {
let functor = self.interner.intern("+");
Ok(Term::Compound {
functor,
args: vec![operand],
})
}
}
}
// Issue #28: ISO `\` (fy 200) — bitwise complement. No literal
// folding; the arithmetic evaluator handles `\N` at `is`-time.
Some(TokenKind::Backslash) => {
self.advance();
let operand = self.parse_primary()?;
let functor = self.interner.intern("\\");
Ok(Term::Compound {
functor,
args: vec![operand],
})
}
Some(TokenKind::LBracket) => {
self.advance(); // skip [
self.parse_list_body()
}
Some(TokenKind::Cut) => {
self.advance();
let id = self.interner.intern("!");
Ok(Term::Atom(id))
}
Some(TokenKind::Not) => {
// \+ Goal — ISO precedence 900fy, parses argument at 700
self.advance();
let goal = self.parse_term()?;
let functor = self.interner.intern("\\+");
Ok(Term::Compound {
functor,
args: vec![goal],
})
}
Some(ref tok) => {
let msg = format!("unexpected {tok}");
Err(self.error_here(msg))
}
None => Err(self.error_here("unexpected end of input")),
}
}
/// Resolve a variable name to a `Term::Var`, allocating a fresh id for
/// `_` (anonymous) and for each distinct named variable within the clause.
fn intern_variable(&mut self, name: String) -> Term {
if name == "_" {
// Anonymous variable — always fresh
let id = self.next_var;
self.next_var += 1;
Term::Var(id)
} else if let Some(&id) = self.var_map.get(&name) {
Term::Var(id)
} else {
let id = self.next_var;
self.next_var += 1;
self.var_map.insert(name, id);
Term::Var(id)
}
}
/// Parse the body of a parenthesized expression, handling ; and ->.
/// Supports: (A ; B), (Cond -> Then), (Cond -> Then ; Else)
fn parse_paren_body(&mut self) -> Result<Term, ParseError> {
let first = self.parse_paren_comma_list()?;
if self.current_kind() == Some(&TokenKind::Arrow) {
// (Cond -> Then) or (Cond -> Then ; Else)
self.advance();
let then = self.parse_paren_comma_list()?;
let arrow_functor = self.interner.intern("->");
let if_then = Term::Compound {
functor: arrow_functor,
args: vec![first, then],
};
if self.current_kind() == Some(&TokenKind::Semicolon) {
self.advance();
let else_branch = self.parse_paren_body()?;
let semi_functor = self.interner.intern(";");
Ok(Term::Compound {
functor: semi_functor,
args: vec![if_then, else_branch],
})
} else {
Ok(if_then)
}
} else if self.current_kind() == Some(&TokenKind::Semicolon) {
// (A ; B)
self.advance();
let right = self.parse_paren_body()?;
let functor = self.interner.intern(";");
Ok(Term::Compound {
functor,
args: vec![first, right],
})
} else {
Ok(first)
}
}
/// Parse a comma-separated goal conjunction within parens, building ','(A,B) terms.
fn parse_paren_comma_list(&mut self) -> Result<Term, ParseError> {
let first = self.parse_term()?;
if self.current_kind() == Some(&TokenKind::Comma) {
// Check that the next comma isn't just the end of an arg list —
// but inside parens for ; / ->, comma means conjunction
self.advance();
let rest = self.parse_paren_comma_list()?;
let functor = self.interner.intern(",");
Ok(Term::Compound {
functor,
args: vec![first, rest],
})
} else {
Ok(first)
}
}
fn parse_arg_list(&mut self) -> Result<Vec<Term>, ParseError> {
let mut args = vec![self.parse_term()?];
while self.current_kind() == Some(&TokenKind::Comma) {
self.advance();
args.push(self.parse_term()?);
}
Ok(args)
}
fn parse_list_body(&mut self) -> Result<Term, ParseError> {
// We're right after '['. Parse list elements.
if self.current_kind() == Some(&TokenKind::RBracket) {
self.advance();
let nil = self.interner.intern("[]");
return Ok(Term::Atom(nil));
}
let first = self.parse_term()?;
self.parse_list_tail(first)
}
fn parse_list_tail(&mut self, head: Term) -> Result<Term, ParseError> {
match self.current_kind() {
Some(TokenKind::Comma) => {
self.advance();
let next_head = self.parse_term()?;
let tail = self.parse_list_tail(next_head)?;
Ok(Term::List {
head: Box::new(head),
tail: Box::new(tail),
})
}
Some(TokenKind::Pipe) => {
self.advance();
let tail = self.parse_term()?;
self.expect(&TokenKind::RBracket)?;
Ok(Term::List {
head: Box::new(head),
tail: Box::new(tail),
})
}
Some(TokenKind::RBracket) => {
self.advance();
let nil = self.interner.intern("[]");
Ok(Term::List {
head: Box::new(head),
tail: Box::new(Term::Atom(nil)),
})
}
_ => Err(self.error_here("Expected ',', '|', or ']' in list")),
}
}
}