mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-15 23:07:14 +00:00
Code Issues 1 Releases Wiki Activity

Make parser errors a bit better for files with no closing

Browse Source 
delimiters.
This commit is contained in:
Calvin Rose
2019-01-17 23:43:46 -05:00
parent c4114fbcdb
commit b4934ceddc
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/core.janet
View File

@@ -1454,6 +1454,12 @@ value, one key will be ignored."
nil
where))))
(if (= (parser/status p) :pending)
(onstatus :parse
(string "unmatched delimiters " (parser/state p))
nil
where))
(set *env* oldenv)
env)

2
src/core/parse.c
View File

@@ -476,7 +476,7 @@ static int root(JanetParser *p, JanetParseState *state, uint8_t c) {
{
Janet ds;
if (p->statecount == 1) {
p->error = "mismatched delimiter";
p->error = "unexpected delimiter";
return 1;
}
if ((c == ')' && (state->flags & PFLAG_PARENS)) ||

15
src/core/peg.c
View File

@@ -24,6 +24,7 @@
#include <string.h>
#include "util.h"
#include "vector.h"
#include "util.h"
/*
* Runtime
@@ -1085,15 +1086,15 @@ static Janet cfun_match(int32_t argc, Janet *argv) {
static const JanetReg cfuns[] = {
{"peg/compile", cfun_compile,
"(peg/compile peg)\n\n"
"Compiles a peg source data structure into a <core/peg>. This will speed up matching "
"if the same peg will be used multiple times."
JDOC("(peg/compile peg)\n\n"
"Compiles a peg source data structure into a <core/peg>. This will speed up matching "
"if the same peg will be used multiple times.")
},
{"peg/match", cfun_match,
"(peg/match peg text [,start=0])\n\n"
"Match a Parsing Expression Grammar to a byte string and return an array of captured values. "
"Returns nil if text does not match the language defined by peg. The syntax of PEGs are very "
"similar to those defined by LPeg, and have similar capabilities."
JDOC("(peg/match peg text [,start=0])\n\n"
"Match a Parsing Expression Grammar to a byte string and return an array of captured values. "
"Returns nil if text does not match the language defined by peg. The syntax of PEGs are very "
"similar to those defined by LPeg, and have similar capabilities.")
},
{NULL, NULL, NULL}
};