From 3222530de8aaa0cf79bc477ba943996c509061b8 Mon Sep 17 00:00:00 2001 From: sbrandt Date: Mon, 18 Mar 2013 16:11:13 +0000 Subject: Don't require a final newline. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4985 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/piraha/Call.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/piraha/Call.cc b/src/piraha/Call.cc index 78dbec32..ca62e0b2 100644 --- a/src/piraha/Call.cc +++ b/src/piraha/Call.cc @@ -715,7 +715,10 @@ void check_types(const char *thorn,int line,ValueType v,int t) { extern "C" int cctk_PirahaParser(const char *buffer,unsigned long buffersize,int (*set_function)(const char *, const char *, int)) { const char *par_file_src = "skipper = ([ \\t\\r\\n]|\\#.*)*\n" - "skipeol = ([ \\t\\r]|\\#.*)*\\n\n" + "skipeol = ([ \\t\\r]|\\#.*)*($|\\n)\n" + "any = [^]\n" + "stringcomment = #.*\n" + "stringparser = ^({stringcomment}|{var}|{name}|{any})*$\n" "any = [^]\n" "stringcomment = #.*\n" "stringparser = ^({stringcomment}|{var}|{name}|{any})*$\n" @@ -758,7 +761,7 @@ extern "C" int cctk_PirahaParser(const char *buffer,unsigned long buffersize,int "parindex = \\[ {expr} \\]\n" "active = (?i:ActiveThorns)\n" "set = ({active} = ({quot}|{name})|{par}( {index}|) = ({array}|\\+?{expr})){-skipeol}\n" - "file = ^( !DESC {quot}|)( ({set}|{active}) )*$\n"; + "file = ^( !DESC {quot}|)( ({set}|{active}) )*$"; compileFile(par_file_grammar,par_file_src,strlen(par_file_src)); -- cgit v1.2.3