vitalif
/
lime
mirror of https://github.com/vitalif/lime
1
0
Fork 0
Code Issues Releases Wiki Activity

Better error messages

master
Vitaliy Filippov 2013-04-20 14:59:16 +04:00
parent ab902b4ac6
commit 8a53d5672c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parse_engine.php
View File

@ -334,7 +334,7 @@ class parse_engine {
// get these before doing anything
$expected = $this->get_steps();
$this->parser->errors[] = $this->descr($type, $semantic) . ' not expected, expected {' . implode(', ', $expected) . '}';
$this->parser->errors[] = $this->descr($type, $semantic) . ' not expected, expected one of ' . implode(', ', $expected);
if ($this->debug) echo "Possibilities before error fixing: {" . implode(', ', $expected) . "}\n";
@ -345,7 +345,7 @@ class parse_engine {
}
} else {
// If that didn't work, give up:
throw new parse_error('Parse Error: ' . $this->descr($type, $semantic) . ' not expected, expected {' . implode(', ', $expected) . '}');
throw new parse_error('Parse Error: ' . $this->descr($type, $semantic) . ' not expected, expected one of ' . implode(', ', $expected));
}
break;
default:
@ -356,8 +356,10 @@ class parse_engine {
private function descr($type, $semantic) {
if (isset($this->descr[$type])) {
return $this->descr[$type];
} else {
} elseif ("$semantic" !== "") {
return $type . ' (' . $semantic . ')';
} else {
return $type;
}
}