parser: RETURN [<native call> AS] SET_FUNC

diff --git a/TODO b/TODO
index 398c1a4a58cb0e4b47f32c02e38ef86b04b9f119..cfd1b8f18223699c8b48ef2cf591a59a95097b0a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,3 +8,4 @@
 * fix right recursion of let_exp and set_exp
 * numeral suffixes
 * improve arargs support, currently it's impossible to map e.g. curl_easy_setopt
+* cpp: asm aliasing/redirects

diff --git a/psi.d/arpa_inet.psi b/psi.d/arpa_inet.psi
index 2a8404ee024a6fe0abc25697263c69447bba5808..a9dbfbc2ab6a4608abe28fde4d33f419bdc0880a 100644 (file)
--- a/psi.d/arpa_inet.psi
+++ b/psi.d/arpa_inet.psi
@@ -1,32 +1,32 @@
 function psi\htonl(int $l) : int {
        let l = intval($l);
-       return to_int(htonl);
+       return htonl(l) as to_int(htonl);
 }
 function psi\htons(int $s) : int {
        let s = intval($s);
-       return to_int(htons);
+       return htons(s) as to_int(htons);
 }
 
 function psi\ntohl(int $l) : int {
        let l = intval($l);
-       return to_int(ntohl);
+       return ntohl(l) as to_int(ntohl);
 }
 function psi\ntohs(int $s) : int {
        let s = intval($s);
-       return to_int(ntohs);
+       return ntohs(s) as to_int(ntohs);
 }
 
 
 function psi\inet_addr(string $cp) : int {
        let cp = strval($cp);
-       return to_int(inet_addr);
+       return inet_addr(cp) as to_int(inet_addr);
 }
 
 function psi\inet_ntoa(array $in) : string {
        let in = arrval($in,
                intval($s_addr)
        );
-       return to_string(inet_ntoa);
+       return inet_ntoa(in) as to_string(inet_ntoa);
 }
 
 function psi\inet_ntop(int $af, string $src) : string {
@@ -34,13 +34,13 @@ function psi\inet_ntop(int $af, string $src) : string {
        let src = strval($src);
        let size = psi\SIZEOF_STRUCT_SOCKADDR_STORAGE;
        let dst = calloc(1, size);
-       return to_string(inet_ntop);
+       return inet_ntop(af, src, dst, size) as to_string(inet_ntop);
 }
 
 function psi\inet_pton(int $af, string $src, string &$dst) : int {
        let af = intval($af);
        let src = strval($src);
        let dst = calloc(1, psi\SIZEOF_STRUCT_SOCKADDR_STORAGE);
-       return to_int(inet_pton);
+       return inet_pton(af, src, dst) as to_int(inet_pton);
        set $dst = to_string(dst, psi\SIZEOF_STRUCT_SOCKADDR_STORAGE);
 }
\ No newline at end of file

diff --git a/psi.d/errno.psi b/psi.d/errno.psi
index 4c987d68b113c5bec1ded99acc72ced02ba1b694..f74d0ed4982295fa62930a7c843f653c6ec5a654 100644 (file)
--- a/psi.d/errno.psi
+++ b/psi.d/errno.psi
@@ -1,5 +1,14 @@
-// redirected macro
-extern int errno();
+#include <errno.h>
+
+#ifdef __GNUC__
+# ifdef linux
 function psi\errno() : int {
-       return to_int(errno);
+       return __errno_location() as to_int(*__errno_location);
 }
+# endif /* linux */
+# ifdef __FreeBSD__
+function psi\errno() : int {
+       return __error() as to_int(*__error);
+}
+# endif /* __FreeBSD__ */
+#endif /* __GNUC__ */

diff --git a/psi.d/getopt.psi b/psi.d/getopt.psi
index ac7fd738c098d2c11bd208a89b4d9108caae985b..42b5ee5763d32564e4b016fe0a08665caf6a2332 100644 (file)
--- a/psi.d/getopt.psi
+++ b/psi.d/getopt.psi
@@ -1,33 +1,37 @@
+#include <getopt.h>
+
 function psi\opterr(int $value) : void {
        let opterr = intval($value);
-       return void(opterr_set);
+       return opterr_set(opterr) as void(opterr_set);
 }
 function psi\optind\get() : int {
-       return to_int(optind_get);
+       return optind_get() as to_int(optind_get);
 }
 function psi\optind\set(int $v) : void {
        let optind = intval($v);
-       return void(optind_set);
+       return optind_set(optind) as void(optind_set);
 }
 function psi\optopt() : int {
-       return to_int(optopt);
+       return optopt() as to_int(optopt);
 }
 function psi\optarg() : string {
-       return to_string(optarg);
+       return optarg() as to_string(optarg);
 }
-/* OSX
+
+#ifdef _OPTRESET
 function psi\optreset() : void {
        let _v = 1;
-       return void(optreset_set);
+       return optreset_set(_v) as void(optreset_set);
 }
-*/
+#endif
+
 static function psi\getopt(array &$argv, string $options) : int {
        let argc = count($argv);
        let argv = &arrval($argv,
                *argv = strval($argv)
        );
        let optstring = strval($options);
-       return to_int(getopt);
+       return getopt(argc, argv, optstring) as to_int(getopt);
        set $argv = to_array(
                *argv,
                argc,

diff --git a/psi.d/glob.psi b/psi.d/glob.psi
index 5e6d21534d452d34c36304878dfb533dbd06f16c..8fc3b0b31c0302a728338c47034a66a42573ff5d 100644 (file)
--- a/psi.d/glob.psi
+++ b/psi.d/glob.psi
@@ -14,7 +14,7 @@ function psi\glob(string $pattern, int $flags, array &$glob = NULL, callable $er
                        strval($gl_pathv)
                )
        );
-       return to_int(glob);
+       return glob(path, flags, err, buf) as to_int(glob);
        set $glob = to_array(*buf,
                to_int(gl_matchc),
                to_int(gl_pathc),

diff --git a/psi.d/netdb.psi b/psi.d/netdb.psi
index f37476d186275cf701243b34c6db58e287700871..cc66e9cde683452913e91ea0a713c07e17d33183 100644 (file)
--- a/psi.d/netdb.psi
+++ b/psi.d/netdb.psi
@@ -1,35 +1,35 @@
 function psi\endhostent() : void {
-       return void(endhostent);
+       return endhostent() as void(endhostent);
 }
-function psi\endnetend() : void {
-       return void(endnetent);
+function psi\endnetent() : void {
+       return endnetent() as void(endnetent);
 }
 function psi\endprotoent() : void {
-       return void(endprotoent);
+       return endprotoent() as void(endprotoent);
 }
 function psi\endservent() : void {
-       return void(endservent);
+       return endservent() as void(endservent);
 }
 
 function psi\sethostent(bool $stayopen) : void {
        let stayopen = intval($stayopen);
-       return void(sethostent);
+       return sethostent(stayopen) as void(sethostent);
 }
-function psi\setnetset(bool $stayopen) : void {
+function psi\setnetent(bool $stayopen) : void {
        let stayopen = intval($stayopen);
-       return void(setnetent);
+       return setnetent(stayopen) as void(setnetent);
 }
 function psi\setprotoent(bool $stayopen) : void {
        let stayopen = intval($stayopen);
-       return void(setprotoent);
+       return setprotoent(stayopen) as void(setprotoent);
 }
 function psi\setservent(bool $stayopen) : void {
        let stayopen = intval($stayopen);
-       return void(setservent);
+       return setservent(stayopen) as void(setservent);
 }
 
 function psi\gethostent() : array {
-       return to_array(*gethostent,
+       return gethostent() as to_array(*gethostent,
                to_string(h_name),
                to_array(h_aliases, to_string(h_aliases)),
                to_int(h_addrtype),
@@ -40,7 +40,7 @@ function psi\gethostent() : array {
 
 function psi\gai_strerror(int $errcode) : string {
        let errcode = intval($errcode);
-       return to_string(gai_strerror);
+       return gai_strerror(errcode) as to_string(gai_strerror);
 }
 
 // extern int getaddrinfo(const char *node, const char *service, const struct addrinfo *hints, struct addrinfo **res)
@@ -54,7 +54,7 @@ function psi\getaddrinfo(string $node, string $service, array $hints = NULL, obj
                intval($ai_protocol)
        );
        let res = &NULL;
-       return to_int(getaddrinfo);
+       return getaddrinfo(node, service, hints, res) as to_int(getaddrinfo);
        set $res = to_array(**res,
                to_int(ai_flags),
                to_int(ai_family),
@@ -77,7 +77,7 @@ function psi\getnameinfo(string $addr, string &$host = NULL, string &$service =
        let servlen = psi\NI_MAXSERV;
        let serv = calloc(servlen, psi\SIZEOF_CHAR);
        let flags = intval($flags);
-       return to_int(getnameinfo);
+       return getnameinfo(sa, salen, hostlen, host, servlen, serv, flags) as to_int(getnameinfo);
        set $host = to_string(host);
        set $service = to_string(serv);
 }

diff --git a/psi.d/stat.psi b/psi.d/stat.psi
index dc89119624d37cc474ee60b3549d440ee74f1472..9b767dacc0d19a1fc4ec44d1e03747877fca9dc8 100644 (file)
--- a/psi.d/stat.psi
+++ b/psi.d/stat.psi
@@ -2,7 +2,7 @@
 function psi\stat(string $path, array &$buf = NULL) : int {
        let path = strval($path);
        let buf = calloc(1, psi\SIZEOF_STRUCT_STAT);
-       return to_int(stat);
+       return stat(path, buf) as to_int(stat);
        set $buf = to_array(*buf,
                to_int(st_dev),
                to_int(st_ino),
@@ -20,7 +20,6 @@ function psi\stat(string $path, array &$buf = NULL) : int {
                        to_int(tv_sec),
                        to_int(tv_nsec)
                ),
-               to_int(st_atime),
                to_array(st_mtim,
                        to_int(tv_sec),
                        to_int(tv_nsec)
@@ -29,7 +28,6 @@ function psi\stat(string $path, array &$buf = NULL) : int {
                        to_int(tv_sec),
                        to_int(tv_nsec)
                ),
-               to_int(st_mtime),
                to_array(st_ctim,
                        to_int(tv_sec),
                        to_int(tv_nsec)
@@ -38,12 +36,14 @@ function psi\stat(string $path, array &$buf = NULL) : int {
                        to_int(tv_sec),
                        to_int(tv_nsec)
                ),
-               to_int(st_ctime),
+               to_array(st_birthtim,
+                       to_int(tv_sec),
+                       to_int(tv_nsec)
+               ),
                to_array(st_birthtimespec,
                        to_int(tv_sec),
                        to_int(tv_nsec)
                ),
-               to_int(st_birthtime),
                to_int(st_blksize),
                to_int(st_blocks),
                to_int(st_flags),

diff --git a/psi.d/stdio.psi b/psi.d/stdio.psi
index 6909354f4be5f2e4dcead79393b704c58937f32f..d4d5945276de9007da5abcb1a1425da86dcf087c 100644 (file)
--- a/psi.d/stdio.psi
+++ b/psi.d/stdio.psi
@@ -1,73 +1,66 @@
-// extern FILE *fopen(char *path, char *mode);
+#include <stdio.h>
+
 function psi\fopen(string $path, string $mode) : object {
        let path = pathval($path);
        let mode = strval($mode);
-       return to_object(fopen);
+       return fopen(path, mode)
+               as to_object(fopen);
 }
 
-// extern int fclose(FILE *stream);
 function psi\fclose(object $stream) : int {
        let stream = objval($stream);
-       return to_int(fclose);
+       return fclose(stream) as to_int(fclose);
 }
 
-// extern size_t fread(void *buf, size_t len, size_t n, FILE *stream);
 function psi\fread(object $stream, string &$data = NULL, int $len = 1, int $n = 8192) : int {
        let len = intval($len);
        let n = intval($n);
        let stream = objval($stream);
        let buf = calloc(n, len);
-       return to_int(fread);
+       pre_assert stream != NULL;
+       return fread(buf, len, n, stream) as to_int(fread);
        set $data = to_string(buf, fread * len);
 }
 
-// extern int feof(FILE *stream);
 function psi\feof(object $stream) : int {
        let stream = objval($stream);
-       return to_int(feof);
+       return feof(stream) as to_int(feof);
 }
 
-// extern int fileno(FILE *stream);
 function psi\fileno(object $stream) : int {
        let stream = objval($stream);
-       return to_int(fileno);
+       return fileno(stream) as to_int(fileno);
 }
 
-// extern int ferror(FILE *stream);
 function psi\ferror(object $stream) : int {
        let stream = objval($stream);
-       return to_int(ferror);
+       return ferror(stream) as to_int(ferror);
 }
 
-// extern void clearerr(FILE *stream);
 function psi\clearerr(object $stream) : void {
        let stream = objval($stream);
-       return void(clearerr);
+       return clearerr(stream) as void(clearerr);
 }
 
-// extern int fseek(FILE *stream, long offset, int whence);
 function psi\fseek(object $stream, int $offset, int $whence) : int {
        let stream = objval($stream);
        let offset = intval($offset);
        let whence = intval($whence);
-       return to_int(fseek);
+       return fseek(stream, offset, whence) as to_int(fseek);
 }
 
-//extern long ftell(FILE *stream);
 function psi\ftell(object $stream) : int {
        let stream = objval($stream);
-       return to_int(ftell);
+       return ftell(stream) as to_int(ftell);
 }
 
-// extern void rewind(FILE *stream);
 function psi\rewind(object $stream) : void {
        let stream = objval($stream);
-       return void(rewind);
+       return rewind(stream) as void(rewind);
 }
 
-//extern int printf(const char *format, ...);
 function psi\printf(string $fmt, mixed ...$args) : int {
        let format = strval($fmt);
-       return to_int(printf);
+       return printf(format) as to_int(printf);
 }
 

diff --git a/psi.d/stdlib.psi b/psi.d/stdlib.psi
index 8191c2f2bbbdfc4ec6fc08f3894e8a602a3c531e..11fa602eb3bac79f6d79f93af800ba62ceb27d83 100644 (file)
--- a/psi.d/stdlib.psi
+++ b/psi.d/stdlib.psi
@@ -1,57 +1,63 @@
+#include <stdlib.h>
+
 function psi\abs(int $i) : int {
        let n = intval($i);
-       return to_int(abs);
+       return abs(n) as to_int(abs);
 }
 
 function psi\div(int $numerator, int $denominator) : array {
        let numerator = intval($numerator);
        let denominator = intval($denominator);
        pre_assert denominator != 0;
-       return to_array(div, to_int(quot), to_int(rem));
+       return div(numerator, denominator)
+               as to_array(div, to_int(quot), to_int(rem));
 }
 
 function psi\ldiv(int $numerator, int $denominator) : array {
        let numerator = intval($numerator);
        let denominator = intval($denominator);
        pre_assert denominator != 0;
-       return to_array(ldiv, to_int(quot), to_int(rem));
+       return ldiv(numerator, denominator) 
+               as to_array(ldiv, to_int(quot), to_int(rem));
 }
 
 function psi\lldiv(int $numerator, int $denominator) : array {
        let numerator = intval($numerator);
        let denominator = intval($denominator);
        pre_assert denominator != 0;
-       return to_array(lldiv, to_int(quot), to_int(rem));
+       return lldiv(numerator, denominator) 
+               as to_array(lldiv, to_int(quot), to_int(rem));
 }
 
 function psi\strtold(string $str, string &$end = null) : float {
        let nptr = strval($str);
        let endptr = &NULL;
-       return to_float(strtold);
+       return strtold(nptr, endptr) 
+               as to_float(strtold);
        set $end = to_string(*endptr);
 }
 
 function psi\free(object $memory) : void {
        let ptr = objval($memory);
-       return void(free);
+       return free(ptr) as void(free);
 }
 
 function psi\malloc(int $size) : object {
        let size = intval($size);
        pre_assert size >= 0;
-       return to_object(malloc);
+       return malloc(size) as to_object(malloc);
 }
 
 function psi\calloc(int $nmemb, int $size) : object {
        let nmemb = intval($nmemb);
        let size = intval($size);
        pre_assert size >= 0;
-       return to_object(calloc);
+       return calloc(nmemb, size) as to_object(calloc);
 }
 
 function psi\realloc(object $obj, int $size) : object {
        let ptr = objval($obj);
        let size = intval($size);
        pre_assert size >= 0;
-       return to_object(realloc);
+       return realloc(ptr, size) as to_object(realloc);
 } 

diff --git a/psi.d/string.psi b/psi.d/string.psi
index 5ea4db4932c223abf33ee1c22929d9ec743edc02..824b7e336126f3196ac039146e61c612904cf221 100644 (file)
--- a/psi.d/string.psi
+++ b/psi.d/string.psi
@@ -1,5 +1,6 @@
-extern char *strerror(int errno);
+#include <string.h>
+
 function psi\strerror(int $errno) : string {
-       let errno = intval($errno);
-       return to_string(strerror);
+       let err = intval($errno);
+       return strerror(err) as to_string(strerror);
 }

diff --git a/psi.d/syslog.psi b/psi.d/syslog.psi
index b3510b85ced848b0a894ac68887b07b26f0e7844..cfb9187c71ad7621c7b2cfdf87e4e8bf149cf282 100644 (file)
--- a/psi.d/syslog.psi
+++ b/psi.d/syslog.psi
@@ -2,7 +2,7 @@ function psi\openlog(string $ident, int $option, int $facility) : void {
        let ident = strval($ident);
        let option = intval($option);
        let facility = intval($facility);
-       return void(openlog);
+       return openlog(ident, option, facility) as void(openlog);
 }
 
 function psi\closelog() : void {
@@ -11,18 +11,18 @@ function psi\closelog() : void {
 
 function psi\setlogmask(int $mask) : int {
        let mask = intval($mask);
-       return to_int(setlogmask);
+       return setlogmask(mask) as to_int(setlogmask);
 }
 
 function psi\syslog(int $priority, string $format, mixed ...$args) : void {
        let priority = intval($priority);
        let format = strval($format);
-       return void(syslog);
+       return syslog(priority, format) as void(syslog);
 }
 
 // redirected macro
 extern int LOG_MASK(int pri);
 function psi\LOG_MASK(int $pri) : int {
        let pri = intval($pri);
-       return to_int(LOG_MASK);
+       return LOG_MASK(pri) as to_int(LOG_MASK);
 }

diff --git a/psi.d/time.psi b/psi.d/time.psi
index 25bc4e86f8d1efbc53eaefc1fa770586920059cb..7fb3cb905a981203d5671aaf79a99b0d5c2ca63b 100644 (file)
--- a/psi.d/time.psi
+++ b/psi.d/time.psi
@@ -1,14 +1,14 @@
 // extern time_t time(time_t *t);
 function psi\time() : int {
        let t = NULL;
-       return to_int(time);
+       return time(t) as to_int(time);
 }
 
 // extern int gettimeofday(struct timeval *tp, struct timezone *tz);
 function psi\gettimeofday(array &$tv = NULL, array &$tz = NULL) : int {
        let tp = calloc(1, psi\SIZEOF_STRUCT_TIMEVAL);
        let tz = calloc(1, psi\SIZEOF_STRUCT_TIMEZONE);
-       return to_int(gettimeofday);
+       return gettimeofday(tp, tz) as to_int(gettimeofday);
        set $tv = to_array(*tp,
                to_int(tv_sec),
                to_int(tv_usec));
@@ -30,7 +30,7 @@ function psi\asctime(array $tm) : string {
                intval($tm_yday),
                intval($tm_isdst)
        );
-       return to_string(asctime);
+       return asctime(tm) as to_string(asctime);
 }
 
 // extern char *asctime_r(struct tm *tm, char *buf);
@@ -47,13 +47,13 @@ function psi\asctime_r(array $tm) : string {
                intval($tm_isdst)
        );
        let buf = calloc(32, psi\SIZEOF_CHAR);
-       return to_string(asctime_r);
+       return asctime_r(tm, buf) as to_string(asctime_r);
 }
 
 // extern struct tm *gmtime(time_t *t);
 function psi\gmtime(int $ts) : array {
        let t = &intval($ts);
-       return to_array(*gmtime,
+       return gmtime(t) as to_array(*gmtime,
                to_int(tm_sec),
                to_int(tm_min),
                to_int(tm_hour),
@@ -70,7 +70,7 @@ function psi\gmtime(int $ts) : array {
 function psi\gmtime_r(int $ts) : array {
        let t = &intval($ts);
        let buf = calloc(1, psi\SIZEOF_STRUCT_TM);
-       return to_array(*gmtime_r,
+       return gmtime_r(t, buf) as to_array(*gmtime_r,
                to_int(tm_sec),
                to_int(tm_min),
                to_int(tm_hour),
@@ -90,7 +90,7 @@ function psi\nanosleep(array $rq = NULL, array &$rm = NULL) : int {
                intval($tv_nsec)
        );
        let rmts = calloc(1, psi\SIZEOF_STRUCT_TIMESPEC);
-       return to_int(nanosleep);
+       return nanosleep(rqts, rmts) as to_int(nanosleep);
        set $rm = to_array(*rmts,
                to_int(tv_sec),
                to_int(tv_nsec)
@@ -100,7 +100,7 @@ function psi\nanosleep(array $rq = NULL, array &$rm = NULL) : int {
 // extern clock_t times(struct tms *buf);
 function psi\times(array &$tms = NULL) : int {
        let buf = calloc(1, psi\SIZEOF_STRUCT_TMS);
-       return to_int(times);
+       return times(buf) as to_int(times);
        set $tms = to_array(*buf,
                to_int(tms_utime),
                to_int(tms_stime),

diff --git a/psi.d/uname.psi b/psi.d/uname.psi
index b7aed9652e7e26dbad3f4201465017165166e236..ae0dd600fe87e0cc73046c3e42a2beaaa5977fdd 100644 (file)
--- a/psi.d/uname.psi
+++ b/psi.d/uname.psi
@@ -1,6 +1,6 @@
 function psi\uname(array &$u = NULL) : int {
        let name = calloc(1, psi\SIZEOF_STRUCT_UTSNAME);
-       return to_int(uname);
+       return uname(name) as to_int(uname);
        set $u = to_array(*name,
                to_string(sysname),
                to_string(nodename),

diff --git a/src/module.c b/src/module.c
index 0c8b3b3315bb0f38b358383fc4ddcc615465d7ef..a657aedd2f2cf95b32699040f4550cfe48629901 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -319,7 +319,18 @@ static PHP_GINIT_FUNCTION(psi)
        BL_DECL_ADD("dlsym");
        BL_DECL_ADD("alloca");
        BL_DECL_ADD("atexit");
+       BL_DECL_ADD("at_quick_exit");
        BL_DECL_ADD("_IO_cookie_init");
+
+       /* va_list as arg */
+       BL_DECL_ADD("*v*printf");
+       BL_DECL_ADD("*v*scanf");
+
+       /* LFS/LFO for 32bit */
+       BL_DECL_ADD("*stat64");
+       BL_DECL_ADD("*statat64");
+       /* Hurd only */
+       BL_DECL_ADD("getumask");
 }
 
 static PHP_GSHUTDOWN_FUNCTION(psi)

diff --git a/src/parser.c b/src/parser.c
index ace7900dfcbebd5f6ebbd9c8440c99e6ecf7585e..aad454662c76db8cda45113826d71f417198c7be 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.2 on Fri Sep  8 10:30:56 2017 */
+/* Generated by re2c 1.0.2 on Mon Sep 11 16:12:23 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -404,7 +404,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 447 "src/parser.re"
+#line 448 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
 #line 410 "src/parser.c"
 yy4:
@@ -418,12 +418,12 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 446 "src/parser.re"
+#line 447 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
 #line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 445 "src/parser.re"
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
 #line 429 "src/parser.c"
 yy9:
@@ -795,18 +795,20 @@ yy54:
                        switch (yych) {
                        case 'R':
                        case 'r':       goto yy145;
+                       case 'S':
+                       case 's':       goto yy146;
                        default:        goto yy62;
                        }
 yy55:
-#line 440 "src/parser.re"
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 804 "src/parser.c"
+#line 806 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy147;
+                       case 'o':       goto yy149;
                        default:        goto yy62;
                        }
 yy57:
@@ -814,9 +816,9 @@ yy57:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy148;
+                       case 'a':       goto yy150;
                        case 'O':
-                       case 'o':       goto yy149;
+                       case 'o':       goto yy151;
                        default:        goto yy62;
                        }
 yy58:
@@ -824,7 +826,7 @@ yy58:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy150;
+                       case 'e':       goto yy152;
                        default:        goto yy62;
                        }
 yy59:
@@ -832,11 +834,11 @@ yy59:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy151;
+                       case 'l':       goto yy153;
                        case 'N':
-                       case 'n':       goto yy152;
+                       case 'n':       goto yy154;
                        case 'R':
-                       case 'r':       goto yy153;
+                       case 'r':       goto yy155;
                        default:        goto yy62;
                        }
 yy60:
@@ -844,13 +846,13 @@ yy60:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy154;
+                       case 'a':       goto yy156;
                        case 'L':
-                       case 'l':       goto yy155;
+                       case 'l':       goto yy157;
                        case 'R':
-                       case 'r':       goto yy156;
+                       case 'r':       goto yy158;
                        case 'U':
-                       case 'u':       goto yy157;
+                       case 'u':       goto yy159;
                        default:        goto yy62;
                        }
 yy61:
@@ -924,7 +926,7 @@ yy62:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
 yy63:
@@ -932,9 +934,9 @@ yy63:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy158;
+                       case 'f':       goto yy160;
                        case 'N':
-                       case 'n':       goto yy160;
+                       case 'n':       goto yy162;
                        default:        goto yy62;
                        }
 yy64:
@@ -942,11 +944,11 @@ yy64:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy161;
+                       case '\'':      goto yy163;
                        case 'E':
-                       case 'e':       goto yy163;
+                       case 'e':       goto yy165;
                        case 'I':
-                       case 'i':       goto yy164;
+                       case 'i':       goto yy166;
                        default:        goto yy62;
                        }
 yy65:
@@ -954,7 +956,7 @@ yy65:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy165;
+                       case 'i':       goto yy167;
                        default:        goto yy62;
                        }
 yy66:
@@ -962,7 +964,7 @@ yy66:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy166;
+                       case 'u':       goto yy168;
                        default:        goto yy62;
                        }
 yy67:
@@ -970,7 +972,7 @@ yy67:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy167;
+                       case 'b':       goto yy169;
                        default:        goto yy62;
                        }
 yy68:
@@ -978,11 +980,11 @@ yy68:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy168;
+                       case 'a':       goto yy170;
                        case 'O':
-                       case 'o':       goto yy169;
+                       case 'o':       goto yy171;
                        case 'R':
-                       case 'r':       goto yy170;
+                       case 'r':       goto yy172;
                        default:        goto yy62;
                        }
 yy69:
@@ -990,7 +992,7 @@ yy69:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy171;
+                       case 'e':       goto yy173;
                        default:        goto yy62;
                        }
 yy70:
@@ -998,9 +1000,9 @@ yy70:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy172;
+                       case 'e':       goto yy174;
                        case 'T':
-                       case 't':       goto yy173;
+                       case 't':       goto yy175;
                        default:        goto yy62;
                        }
 yy71:
@@ -1008,11 +1010,11 @@ yy71:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy174;
+                       case 'e':       goto yy176;
                        case 'O':
-                       case 'o':       goto yy175;
+                       case 'o':       goto yy177;
                        case 'R':
-                       case 'r':       goto yy176;
+                       case 'r':       goto yy178;
                        default:        goto yy62;
                        }
 yy72:
@@ -1020,9 +1022,9 @@ yy72:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy177;
+                       case '\'':      goto yy179;
                        case 'N':
-                       case 'n':       goto yy179;
+                       case 'n':       goto yy181;
                        default:        goto yy62;
                        }
 yy73:
@@ -1030,7 +1032,7 @@ yy73:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy180;
+                       case 'a':       goto yy182;
                        default:        goto yy62;
                        }
 yy74:
@@ -1038,14 +1040,14 @@ yy74:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy181;
+                       case 'v':       goto yy183;
                        default:        goto yy62;
                        }
 yy75:
                        ++cur;
 #line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1049 "src/parser.c"
+#line 1051 "src/parser.c"
 yy77:
                        yych = *++cur;
                        switch (yych) {
@@ -1124,35 +1126,35 @@ yy77:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy78;
-                       default:        goto yy182;
+                       default:        goto yy184;
                        }
 yy78:
 #line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1133 "src/parser.c"
+#line 1135 "src/parser.c"
 yy79:
                        ++cur;
 #line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1138 "src/parser.c"
+#line 1140 "src/parser.c"
 yy81:
                        ++cur;
 #line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1143 "src/parser.c"
+#line 1145 "src/parser.c"
 yy83:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy185;
+                       case '_':       goto yy187;
                        default:        goto yy62;
                        }
 yy84:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy147;
-                       case 'o':       goto yy186;
+                       case 'O':       goto yy149;
+                       case 'o':       goto yy188;
                        default:        goto yy62;
                        }
 yy85:
@@ -1160,10 +1162,10 @@ yy85:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy148;
-                       case 'O':       goto yy149;
-                       case 'h':       goto yy187;
-                       case 'o':       goto yy188;
+                       case 'a':       goto yy150;
+                       case 'O':       goto yy151;
+                       case 'h':       goto yy189;
+                       case 'o':       goto yy190;
                        default:        goto yy62;
                        }
 yy86:
@@ -1171,8 +1173,8 @@ yy86:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy150;
-                       case 'o':       goto yy189;
+                       case 'e':       goto yy152;
+                       case 'o':       goto yy191;
                        default:        goto yy62;
                        }
 yy87:
@@ -1180,11 +1182,11 @@ yy87:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy151;
-                       case 'N':       goto yy152;
+                       case 'l':       goto yy153;
+                       case 'N':       goto yy154;
                        case 'R':
-                       case 'r':       goto yy153;
-                       case 'n':       goto yy190;
+                       case 'r':       goto yy155;
+                       case 'n':       goto yy192;
                        default:        goto yy62;
                        }
 yy88:
@@ -1192,13 +1194,13 @@ yy88:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy154;
-                       case 'L':       goto yy155;
+                       case 'a':       goto yy156;
+                       case 'L':       goto yy157;
                        case 'R':
-                       case 'r':       goto yy156;
+                       case 'r':       goto yy158;
                        case 'U':
-                       case 'u':       goto yy157;
-                       case 'l':       goto yy191;
+                       case 'u':       goto yy159;
+                       case 'l':       goto yy193;
                        default:        goto yy62;
                        }
 yy89:
@@ -1206,9 +1208,9 @@ yy89:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy158;
-                       case 'N':       goto yy160;
-                       case 'n':       goto yy192;
+                       case 'f':       goto yy160;
+                       case 'N':       goto yy162;
+                       case 'n':       goto yy194;
                        default:        goto yy62;
                        }
 yy90:
@@ -1216,10 +1218,10 @@ yy90:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy163;
-                       case 'I':       goto yy164;
-                       case 'i':       goto yy193;
-                       case 'o':       goto yy194;
+                       case 'e':       goto yy165;
+                       case 'I':       goto yy166;
+                       case 'i':       goto yy195;
+                       case 'o':       goto yy196;
                        default:        goto yy62;
                        }
 yy91:
@@ -1227,11 +1229,11 @@ yy91:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy168;
+                       case 'a':       goto yy170;
                        case 'O':
-                       case 'o':       goto yy169;
-                       case 'R':       goto yy170;
-                       case 'r':       goto yy195;
+                       case 'o':       goto yy171;
+                       case 'R':       goto yy172;
+                       case 'r':       goto yy197;
                        default:        goto yy62;
                        }
 yy92:
@@ -1239,11 +1241,11 @@ yy92:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy172;
-                       case 'T':       goto yy173;
-                       case 'h':       goto yy196;
-                       case 'i':       goto yy197;
-                       case 't':       goto yy198;
+                       case 'e':       goto yy174;
+                       case 'T':       goto yy175;
+                       case 'h':       goto yy198;
+                       case 'i':       goto yy199;
+                       case 't':       goto yy200;
                        default:        goto yy62;
                        }
 yy93:
@@ -1251,12 +1253,12 @@ yy93:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy174;
+                       case 'e':       goto yy176;
                        case 'O':
-                       case 'o':       goto yy175;
+                       case 'o':       goto yy177;
                        case 'R':
-                       case 'r':       goto yy176;
-                       case 'y':       goto yy199;
+                       case 'r':       goto yy178;
+                       case 'y':       goto yy201;
                        default:        goto yy62;
                        }
 yy94:
@@ -1264,54 +1266,54 @@ yy94:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy200;
-                       case '8':       goto yy202;
-                       case 'N':       goto yy179;
-                       case 'n':       goto yy203;
+                       case '\'':      goto yy202;
+                       case '8':       goto yy204;
+                       case 'N':       goto yy181;
+                       case 'n':       goto yy205;
                        default:        goto yy62;
                        }
 yy95:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy204;
+                       case 'o':       goto yy206;
                        default:        goto yy62;
                        }
 yy96:
                        ++cur;
 #line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1285 "src/parser.c"
+#line 1287 "src/parser.c"
 yy98:
                        yych = *++cur;
                        switch (yych) {
-                       case '|':       goto yy205;
+                       case '|':       goto yy207;
                        default:        goto yy99;
                        }
 yy99:
 #line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1295 "src/parser.c"
+#line 1297 "src/parser.c"
 yy100:
                        ++cur;
 #line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1300 "src/parser.c"
+#line 1302 "src/parser.c"
 yy102:
                        ++cur;
 #line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1305 "src/parser.c"
+#line 1307 "src/parser.c"
 yy104:
                        ++cur;
 #line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1310 "src/parser.c"
+#line 1312 "src/parser.c"
 yy106:
                        ++cur;
 #line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1315 "src/parser.c"
+#line 1317 "src/parser.c"
 yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -1385,14 +1387,14 @@ yy108:
                        default:        goto yy108;
                        }
 yy110:
-#line 442 "src/parser.re"
+#line 443 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1391 "src/parser.c"
+#line 1393 "src/parser.c"
 yy111:
                        ++cur;
 #line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1396 "src/parser.c"
+#line 1398 "src/parser.c"
 yy113:
                        yych = *++cur;
                        switch (yych) {
@@ -1419,85 +1421,86 @@ yy114:
                        case 5:         goto yy55;
                        case 6:         goto yy118;
                        case 7:         goto yy129;
-                       case 8:         goto yy159;
-                       case 9:         goto yy184;
-                       case 10:        goto yy240;
+                       case 8:         goto yy147;
+                       case 9:         goto yy161;
+                       case 10:        goto yy186;
                        case 11:        goto yy242;
-                       case 12:        goto yy251;
-                       case 13:        goto yy271;
-                       case 14:        goto yy303;
+                       case 12:        goto yy244;
+                       case 13:        goto yy253;
+                       case 14:        goto yy273;
                        case 15:        goto yy305;
-                       case 16:        goto yy311;
-                       case 17:        goto yy319;
-                       case 18:        goto yy331;
-                       case 19:        goto yy339;
-                       case 20:        goto yy343;
-                       case 21:        goto yy350;
+                       case 16:        goto yy307;
+                       case 17:        goto yy313;
+                       case 18:        goto yy321;
+                       case 19:        goto yy333;
+                       case 20:        goto yy341;
+                       case 21:        goto yy345;
                        case 22:        goto yy352;
-                       case 23:        goto yy356;
-                       case 24:        goto yy359;
+                       case 23:        goto yy354;
+                       case 24:        goto yy358;
                        case 25:        goto yy361;
-                       case 26:        goto yy371;
-                       case 27:        goto yy374;
-                       case 28:        goto yy381;
-                       case 29:        goto yy384;
+                       case 26:        goto yy363;
+                       case 27:        goto yy373;
+                       case 28:        goto yy376;
+                       case 29:        goto yy383;
                        case 30:        goto yy386;
                        case 31:        goto yy388;
-                       case 32:        goto yy392;
-                       case 33:        goto yy397;
-                       case 34:        goto yy415;
-                       case 35:        goto yy423;
-                       case 36:        goto yy426;
-                       case 37:        goto yy429;
-                       case 38:        goto yy435;
-                       case 39:        goto yy439;
-                       case 40:        goto yy444;
+                       case 32:        goto yy390;
+                       case 33:        goto yy394;
+                       case 34:        goto yy399;
+                       case 35:        goto yy417;
+                       case 36:        goto yy425;
+                       case 37:        goto yy428;
+                       case 38:        goto yy431;
+                       case 39:        goto yy437;
+                       case 40:        goto yy441;
                        case 41:        goto yy446;
-                       case 42:        goto yy450;
-                       case 43:        goto yy453;
+                       case 42:        goto yy448;
+                       case 43:        goto yy452;
                        case 44:        goto yy455;
                        case 45:        goto yy457;
-                       case 46:        goto yy462;
+                       case 46:        goto yy459;
                        case 47:        goto yy464;
                        case 48:        goto yy466;
                        case 49:        goto yy468;
                        case 50:        goto yy470;
-                       case 51:        goto yy475;
-                       case 52:        goto yy485;
+                       case 51:        goto yy472;
+                       case 52:        goto yy477;
                        case 53:        goto yy487;
                        case 54:        goto yy489;
                        case 55:        goto yy491;
                        case 56:        goto yy493;
-                       case 57:        goto yy498;
-                       case 58:        goto yy502;
-                       case 59:        goto yy506;
+                       case 57:        goto yy495;
+                       case 58:        goto yy500;
+                       case 59:        goto yy504;
                        case 60:        goto yy508;
-                       case 61:        goto yy513;
-                       case 62:        goto yy518;
+                       case 61:        goto yy510;
+                       case 62:        goto yy515;
                        case 63:        goto yy520;
-                       case 64:        goto yy528;
-                       case 65:        goto yy532;
+                       case 64:        goto yy522;
+                       case 65:        goto yy530;
                        case 66:        goto yy534;
                        case 67:        goto yy536;
                        case 68:        goto yy538;
-                       case 69:        goto yy543;
+                       case 69:        goto yy540;
                        case 70:        goto yy545;
-                       case 71:        goto yy551;
-                       case 72:        goto yy556;
+                       case 71:        goto yy547;
+                       case 72:        goto yy553;
                        case 73:        goto yy558;
-                       case 74:        goto yy563;
+                       case 74:        goto yy560;
                        case 75:        goto yy565;
-                       case 76:        goto yy573;
-                       case 77:        goto yy577;
-                       case 78:        goto yy581;
-                       case 79:        goto yy585;
+                       case 76:        goto yy567;
+                       case 77:        goto yy575;
+                       case 78:        goto yy579;
+                       case 79:        goto yy583;
                        case 80:        goto yy587;
-                       default:        goto yy592;
+                       case 81:        goto yy589;
+                       default:        goto yy594;
                        }
 yy115:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy207;
+                       case '.':       goto yy209;
                        default:        goto yy114;
                        }
 yy116:
@@ -1517,27 +1520,27 @@ yy116:
                        case '8':
                        case '9':       goto yy116;
                        case 'D':
-                       case 'd':       goto yy209;
+                       case 'd':       goto yy211;
                        case 'F':
-                       case 'f':       goto yy210;
+                       case 'f':       goto yy212;
                        case 'L':
-                       case 'l':       goto yy212;
+                       case 'l':       goto yy214;
                        default:        goto yy118;
                        }
 yy118:
 #line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1531 "src/parser.c"
+#line 1534 "src/parser.c"
 yy119:
                        ++cur;
 #line 328 "src/parser.re"
                        { goto comment; }
-#line 1536 "src/parser.c"
+#line 1539 "src/parser.c"
 yy121:
                        ++cur;
 #line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1541 "src/parser.c"
+#line 1544 "src/parser.c"
 yy123:
                        yyaccept = 6;
                        mrk = ++cur;
@@ -1555,13 +1558,13 @@ yy123:
                        case '8':
                        case '9':       goto yy123;
                        case 'D':
-                       case 'd':       goto yy209;
+                       case 'd':       goto yy211;
                        case 'E':
                        case 'e':       goto yy127;
                        case 'F':
-                       case 'f':       goto yy210;
+                       case 'f':       goto yy212;
                        case 'L':
-                       case 'l':       goto yy212;
+                       case 'l':       goto yy214;
                        default:        goto yy118;
                        }
 yy125:
@@ -1606,28 +1609,28 @@ yy128:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy214;
+                       case 'l':       goto yy216;
                        case 'U':
-                       case 'u':       goto yy215;
+                       case 'u':       goto yy217;
                        default:        goto yy129;
                        }
 yy129:
                        cur -= 1;
 #line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1619 "src/parser.c"
+#line 1622 "src/parser.c"
 yy130:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy217;
+                       case 'l':       goto yy219;
                        default:        goto yy131;
                        }
 yy131:
                        cur -= 1;
 #line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1631 "src/parser.c"
+#line 1634 "src/parser.c"
 yy132:
                        yych = *++cur;
                        switch (yych) {
@@ -1652,7 +1655,7 @@ yy132:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy218;
+                       case 'f':       goto yy220;
                        default:        goto yy114;
                        }
 yy133:
@@ -1726,43 +1729,118 @@ yy133:
                        case 'x':
                        case 'y':
                        case 'z':       goto yy133;
-                       case '>':       goto yy220;
+                       case '>':       goto yy222;
                        default:        goto yy114;
                        }
 yy135:
                        ++cur;
 #line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1737 "src/parser.c"
+#line 1740 "src/parser.c"
 yy137:
                        ++cur;
 #line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1742 "src/parser.c"
+#line 1745 "src/parser.c"
 yy139:
                        ++cur;
 #line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1747 "src/parser.c"
+#line 1750 "src/parser.c"
 yy141:
                        ++cur;
 #line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1752 "src/parser.c"
+#line 1755 "src/parser.c"
 yy143:
                        ++cur;
 #line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1757 "src/parser.c"
+#line 1760 "src/parser.c"
 yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy222;
+                       case 'r':       goto yy224;
                        default:        goto yy62;
                        }
 yy146:
+                       yyaccept = 8;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy147;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy147:
+#line 421 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AS); goto start; }
+#line 1843 "src/parser.c"
+yy148:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1842,100 +1920,100 @@ yy146:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy114;
-                       default:        goto yy182;
+                       default:        goto yy184;
                        }
-yy147:
+yy149:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy223;
+                       case 'o':       goto yy225;
                        default:        goto yy62;
                        }
-yy148:
+yy150:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy224;
+                       case 'l':       goto yy226;
                        default:        goto yy62;
                        }
-yy149:
+yy151:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy225;
+                       case 'u':       goto yy227;
                        default:        goto yy62;
                        }
-yy150:
+yy152:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy226;
+                       case 'f':       goto yy228;
                        default:        goto yy62;
                        }
-yy151:
+yy153:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy227;
+                       case 'i':       goto yy229;
                        case 'S':
-                       case 's':       goto yy228;
+                       case 's':       goto yy230;
                        default:        goto yy62;
                        }
-yy152:
+yy154:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy229;
+                       case 'd':       goto yy231;
                        default:        goto yy62;
                        }
-yy153:
+yy155:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy230;
+                       case 'r':       goto yy232;
                        default:        goto yy62;
                        }
-yy154:
+yy156:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy231;
+                       case 'l':       goto yy233;
                        default:        goto yy62;
                        }
-yy155:
+yy157:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy232;
+                       case 'o':       goto yy234;
                        default:        goto yy62;
                        }
-yy156:
+yy158:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy233;
+                       case 'e':       goto yy235;
                        default:        goto yy62;
                        }
-yy157:
+yy159:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy234;
+                       case 'n':       goto yy236;
                        default:        goto yy62;
                        }
-yy158:
-                       yyaccept = 8;
+yy160:
+                       yyaccept = 9;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2001,179 +2079,179 @@ yy158:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy159;
+                       case 0x7F:      goto yy161;
                        case 'D':
-                       case 'd':       goto yy235;
+                       case 'd':       goto yy237;
                        case 'N':
-                       case 'n':       goto yy236;
-                       case '\\':      goto yy146;
+                       case 'n':       goto yy238;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy159:
+yy161:
 #line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 2016 "src/parser.c"
-yy160:
+#line 2094 "src/parser.c"
+yy162:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy237;
+                       case 'c':       goto yy239;
                        case 'T':
-                       case 't':       goto yy238;
+                       case 't':       goto yy240;
                        default:        goto yy62;
                        }
-yy161:
+yy163:
                        ++cur;
                        cur -= 1;
 #line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2032 "src/parser.c"
-yy163:
+#line 2110 "src/parser.c"
+yy165:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy239;
+                       case 't':       goto yy241;
                        default:        goto yy62;
                        }
-yy164:
+yy166:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy241;
+                       case 'b':       goto yy243;
                        default:        goto yy62;
                        }
-yy165:
+yy167:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy243;
+                       case 'x':       goto yy245;
                        default:        goto yy62;
                        }
-yy166:
+yy168:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy244;
+                       case 'l':       goto yy246;
                        default:        goto yy62;
                        }
-yy167:
+yy169:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy245;
+                       case 'j':       goto yy247;
                        default:        goto yy62;
                        }
-yy168:
+yy170:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy246;
+                       case 't':       goto yy248;
                        default:        goto yy62;
                        }
-yy169:
+yy171:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy247;
+                       case 's':       goto yy249;
                        default:        goto yy62;
                        }
-yy170:
+yy172:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy248;
+                       case 'e':       goto yy250;
                        default:        goto yy62;
                        }
-yy171:
+yy173:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy249;
+                       case 't':       goto yy251;
                        default:        goto yy62;
                        }
-yy172:
+yy174:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy250;
+                       case 't':       goto yy252;
                        default:        goto yy62;
                        }
-yy173:
+yy175:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy252;
+                       case 'a':       goto yy254;
                        case 'R':
-                       case 'r':       goto yy253;
+                       case 'r':       goto yy255;
                        default:        goto yy62;
                        }
-yy174:
+yy176:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy254;
+                       case 'm':       goto yy256;
                        default:        goto yy62;
                        }
-yy175:
+yy177:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy255;
+                       case '_':       goto yy257;
                        default:        goto yy62;
                        }
-yy176:
+yy178:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy256;
+                       case 'u':       goto yy258;
                        default:        goto yy62;
                        }
-yy177:
+yy179:
                        ++cur;
                        cur -= 1;
 #line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2151 "src/parser.c"
-yy179:
+#line 2229 "src/parser.c"
+yy181:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy257;
+                       case 'd':       goto yy259;
                        default:        goto yy62;
                        }
-yy180:
+yy182:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy258;
+                       case 'r':       goto yy260;
                        default:        goto yy62;
                        }
-yy181:
+yy183:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy259;
+                       case 'a':       goto yy261;
                        default:        goto yy62;
                        }
-yy182:
-                       yyaccept = 9;
+yy184:
+                       yyaccept = 10;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -2241,231 +2319,231 @@ yy182:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy184;
-                       case '\\':      goto yy146;
-                       default:        goto yy182;
+                       case 0x7F:      goto yy186;
+                       case '\\':      goto yy148;
+                       default:        goto yy184;
                        }
-yy184:
-#line 441 "src/parser.re"
+yy186:
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2252 "src/parser.c"
-yy185:
+#line 2330 "src/parser.c"
+yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy260;
-                       case 'e':       goto yy261;
-                       case 'i':       goto yy262;
-                       case 'r':       goto yy263;
+                       case 'a':       goto yy262;
+                       case 'e':       goto yy263;
+                       case 'i':       goto yy264;
+                       case 'r':       goto yy265;
                        default:        goto yy62;
                        }
-yy186:
+yy188:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy223;
-                       case 'o':       goto yy264;
+                       case 'O':       goto yy225;
+                       case 'o':       goto yy266;
                        default:        goto yy62;
                        }
-yy187:
+yy189:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy265;
+                       case 'a':       goto yy267;
                        default:        goto yy62;
                        }
-yy188:
+yy190:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy225;
-                       case 'n':       goto yy266;
+                       case 'u':       goto yy227;
+                       case 'n':       goto yy268;
                        default:        goto yy62;
                        }
-yy189:
+yy191:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy267;
+                       case 'u':       goto yy269;
                        default:        goto yy62;
                        }
-yy190:
+yy192:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy229;
-                       case 'u':       goto yy268;
+                       case 'd':       goto yy231;
+                       case 'u':       goto yy270;
                        default:        goto yy62;
                        }
-yy191:
+yy193:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy232;
-                       case 'o':       goto yy269;
+                       case 'O':       goto yy234;
+                       case 'o':       goto yy271;
                        default:        goto yy62;
                        }
-yy192:
+yy194:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy237;
-                       case 'T':       goto yy238;
-                       case 't':       goto yy270;
+                       case 'c':       goto yy239;
+                       case 'T':       goto yy240;
+                       case 't':       goto yy272;
                        default:        goto yy62;
                        }
-yy193:
+yy195:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy241;
-                       case 'n':       goto yy272;
+                       case 'b':       goto yy243;
+                       case 'n':       goto yy274;
                        default:        goto yy62;
                        }
-yy194:
+yy196:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy273;
+                       case 'n':       goto yy275;
                        default:        goto yy62;
                        }
-yy195:
+yy197:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy248;
-                       case 'a':       goto yy274;
+                       case 'e':       goto yy250;
+                       case 'a':       goto yy276;
                        default:        goto yy62;
                        }
-yy196:
+yy198:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy275;
+                       case 'o':       goto yy277;
                        default:        goto yy62;
                        }
-yy197:
+yy199:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy276;
-                       case 'z':       goto yy277;
+                       case 'g':       goto yy278;
+                       case 'z':       goto yy279;
                        default:        goto yy62;
                        }
-yy198:
+yy200:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy252;
-                       case 'R':       goto yy253;
-                       case 'r':       goto yy278;
+                       case 'a':       goto yy254;
+                       case 'R':       goto yy255;
+                       case 'r':       goto yy280;
                        default:        goto yy62;
                        }
-yy199:
+yy201:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'p':       goto yy279;
+                       case 'p':       goto yy281;
                        default:        goto yy62;
                        }
-yy200:
+yy202:
                        ++cur;
                        cur -= 1;
 #line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2383 "src/parser.c"
-yy202:
+#line 2461 "src/parser.c"
+yy204:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '"':       goto yy280;
+                       case '"':       goto yy282;
                        default:        goto yy62;
                        }
-yy203:
+yy205:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy257;
-                       case 'i':       goto yy282;
-                       case 's':       goto yy283;
+                       case 'd':       goto yy259;
+                       case 'i':       goto yy284;
+                       case 's':       goto yy285;
                        default:        goto yy62;
                        }
-yy204:
+yy206:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy284;
-                       case 'l':       goto yy285;
+                       case 'i':       goto yy286;
+                       case 'l':       goto yy287;
                        default:        goto yy62;
                        }
-yy205:
+yy207:
                        ++cur;
 #line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2413 "src/parser.c"
-yy207:
+#line 2491 "src/parser.c"
+yy209:
                        ++cur;
 #line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2418 "src/parser.c"
-yy209:
+#line 2496 "src/parser.c"
+yy211:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy286;
+                       case 'd':       goto yy288;
                        case 'F':
-                       case 'f':       goto yy288;
+                       case 'f':       goto yy290;
                        case 'L':
-                       case 'l':       goto yy290;
+                       case 'l':       goto yy292;
                        default:        goto yy114;
                        }
-yy210:
+yy212:
                        ++cur;
                        cur -= 1;
 #line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2435 "src/parser.c"
-yy212:
+#line 2513 "src/parser.c"
+yy214:
                        ++cur;
                        cur -= 1;
 #line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2441 "src/parser.c"
-yy214:
+#line 2519 "src/parser.c"
+yy216:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy292;
+                       case 'u':       goto yy294;
                        default:        goto yy114;
                        }
-yy215:
+yy217:
                        ++cur;
-yy216:
+yy218:
                        cur -= 2;
 #line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2455 "src/parser.c"
-yy217:
+#line 2533 "src/parser.c"
+yy219:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy292;
-                       default:        goto yy216;
+                       case 'l':       goto yy294;
+                       default:        goto yy218;
                        }
-yy218:
+yy220:
                        yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
-                       case '.':       goto yy294;
+                       case '.':       goto yy296;
                        case '0':
                        case '1':
                        case '2':
@@ -2487,7 +2565,7 @@ yy218:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy218;
+                       case 'f':       goto yy220;
                        case 'L':
                        case 'l':       goto yy128;
                        case 'P':
@@ -2496,151 +2574,151 @@ yy218:
                        case 'u':       goto yy130;
                        default:        goto yy39;
                        }
-yy220:
+yy222:
                        ++cur;
-#line 443 "src/parser.re"
+#line 444 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2504 "src/parser.c"
-yy222:
+#line 2582 "src/parser.c"
+yy224:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy296;
+                       case 'a':       goto yy298;
                        case 'V':
-                       case 'v':       goto yy297;
+                       case 'v':       goto yy299;
                        default:        goto yy62;
                        }
-yy223:
+yy225:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy298;
+                       case 'l':       goto yy300;
                        default:        goto yy62;
                        }
-yy224:
+yy226:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy299;
+                       case 'l':       goto yy301;
                        default:        goto yy62;
                        }
-yy225:
+yy227:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy300;
+                       case 'n':       goto yy302;
                        default:        goto yy62;
                        }
-yy226:
+yy228:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy301;
+                       case 'i':       goto yy303;
                        default:        goto yy62;
                        }
-yy227:
+yy229:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy302;
+                       case 'f':       goto yy304;
                        default:        goto yy62;
                        }
-yy228:
+yy230:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy304;
+                       case 'e':       goto yy306;
                        default:        goto yy62;
                        }
-yy229:
+yy231:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy306;
+                       case 'i':       goto yy308;
                        default:        goto yy62;
                        }
-yy230:
+yy232:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy307;
+                       case 'o':       goto yy309;
                        default:        goto yy62;
                        }
-yy231:
+yy233:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy308;
+                       case 's':       goto yy310;
                        default:        goto yy62;
                        }
-yy232:
+yy234:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy309;
+                       case 'a':       goto yy311;
                        default:        goto yy62;
                        }
-yy233:
+yy235:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy310;
+                       case 'e':       goto yy312;
                        default:        goto yy62;
                        }
-yy234:
+yy236:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy312;
+                       case 'c':       goto yy314;
                        default:        goto yy62;
                        }
-yy235:
+yy237:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy313;
+                       case 'e':       goto yy315;
                        default:        goto yy62;
                        }
-yy236:
+yy238:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy314;
+                       case 'd':       goto yy316;
                        default:        goto yy62;
                        }
-yy237:
+yy239:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy315;
+                       case 'l':       goto yy317;
                        default:        goto yy62;
                        }
-yy238:
+yy240:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy316;
+                       case 'v':       goto yy318;
                        default:        goto yy62;
                        }
-yy239:
-                       yyaccept = 10;
+yy241:
+                       yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2706,16 +2784,16 @@ yy239:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy240;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy242;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy240:
+yy242:
 #line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2717 "src/parser.c"
-yy241:
-                       yyaccept = 11;
+#line 2795 "src/parser.c"
+yy243:
+                       yyaccept = 12;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2781,73 +2859,73 @@ yy241:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy242;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy244;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy242:
+yy244:
 #line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2792 "src/parser.c"
-yy243:
+#line 2870 "src/parser.c"
+yy245:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy317;
+                       case 'e':       goto yy319;
                        default:        goto yy62;
                        }
-yy244:
+yy246:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy318;
+                       case 'l':       goto yy320;
                        default:        goto yy62;
                        }
-yy245:
+yy247:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy320;
+                       case 'e':       goto yy322;
                        case 'V':
-                       case 'v':       goto yy321;
+                       case 'v':       goto yy323;
                        default:        goto yy62;
                        }
-yy246:
+yy248:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy322;
+                       case 'h':       goto yy324;
                        default:        goto yy62;
                        }
-yy247:
+yy249:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy323;
+                       case 't':       goto yy325;
                        default:        goto yy62;
                        }
-yy248:
+yy250:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy324;
+                       case '_':       goto yy326;
                        default:        goto yy62;
                        }
-yy249:
+yy251:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy325;
+                       case 'u':       goto yy327;
                        default:        goto yy62;
                        }
-yy250:
-                       yyaccept = 12;
+yy252:
+                       yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2913,69 +2991,61 @@ yy250:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy251;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy253;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy251:
+yy253:
 #line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2924 "src/parser.c"
-yy252:
+#line 3002 "src/parser.c"
+yy254:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy326;
+                       case 't':       goto yy328;
                        default:        goto yy62;
                        }
-yy253:
+yy255:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy327;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy328;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy329;
+                       case 'v':       goto yy331;
                        default:        goto yy62;
                        }
-yy254:
+yy256:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy330;
+                       case 'p':       goto yy332;
                        default:        goto yy62;
                        }
-yy255:
+yy257:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy332;
+                       case 'a':       goto yy334;
                        case 'B':
-                       case 'b':       goto yy333;
+                       case 'b':       goto yy335;
                        case 'F':
-                       case 'f':       goto yy334;
+                       case 'f':       goto yy336;
                        case 'I':
-                       case 'i':       goto yy335;
+                       case 'i':       goto yy337;
                        case 'O':
-                       case 'o':       goto yy336;
+                       case 'o':       goto yy338;
                        case 'S':
-                       case 's':       goto yy337;
+                       case 's':       goto yy339;
                        default:        goto yy62;
                        }
-yy256:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy338;
-                       default:        goto yy62;
-                       }
-yy257:
+yy258:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2983,97 +3053,105 @@ yy257:
                        case 'e':       goto yy340;
                        default:        goto yy62;
                        }
-yy258:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy341;
-                       default:        goto yy62;
-                       }
 yy259:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy342;
+                       case 'E':
+                       case 'e':       goto yy342;
                        default:        goto yy62;
                        }
 yy260:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy344;
-                       case 't':       goto yy345;
+                       case 'N':
+                       case 'n':       goto yy343;
                        default:        goto yy62;
                        }
 yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy346;
+                       case 'L':
+                       case 'l':       goto yy344;
                        default:        goto yy62;
                        }
 yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy347;
+                       case 's':       goto yy346;
+                       case 't':       goto yy347;
                        default:        goto yy62;
                        }
 yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy348;
+                       case 'x':       goto yy348;
                        default:        goto yy62;
                        }
 yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':       goto yy298;
-                       case 'l':       goto yy349;
+                       case 'n':       goto yy349;
                        default:        goto yy62;
                        }
 yy265:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy351;
+                       case 'e':       goto yy350;
                        default:        goto yy62;
                        }
 yy266:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy353;
+                       case 'L':       goto yy300;
+                       case 'l':       goto yy351;
                        default:        goto yy62;
                        }
 yy267:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy354;
+                       case 'r':       goto yy353;
                        default:        goto yy62;
                        }
 yy268:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy355;
+                       case 's':       goto yy355;
                        default:        goto yy62;
                        }
 yy269:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':       goto yy309;
-                       case 'a':       goto yy357;
+                       case 'b':       goto yy356;
                        default:        goto yy62;
                        }
 yy270:
-                       yyaccept = 13;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy357;
+                       default:        goto yy62;
+                       }
+yy271:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy311;
+                       case 'a':       goto yy359;
+                       default:        goto yy62;
+                       }
+yy272:
+                       yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3139,137 +3217,137 @@ yy270:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy271;
+                       case 0x7F:      goto yy273;
                        case 'V':
-                       case 'v':       goto yy316;
-                       case '\\':      goto yy146;
+                       case 'v':       goto yy318;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy271:
+yy273:
 #line 385 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT); goto start; }
-#line 3152 "src/parser.c"
-yy272:
+#line 3230 "src/parser.c"
+yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy358;
+                       case 'e':       goto yy360;
                        default:        goto yy62;
                        }
-yy273:
+yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy360;
+                       case 'g':       goto yy362;
                        default:        goto yy62;
                        }
-yy274:
+yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy362;
+                       case 'g':       goto yy364;
                        default:        goto yy62;
                        }
-yy275:
+yy277:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy363;
+                       case 'r':       goto yy365;
                        default:        goto yy62;
                        }
-yy276:
+yy278:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy364;
+                       case 'n':       goto yy366;
                        default:        goto yy62;
                        }
-yy277:
+yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy365;
+                       case 'e':       goto yy367;
                        default:        goto yy62;
                        }
-yy278:
+yy280:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy327;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy328;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy329;
-                       case 'u':       goto yy366;
+                       case 'v':       goto yy331;
+                       case 'u':       goto yy368;
                        default:        goto yy62;
                        }
-yy279:
+yy281:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy367;
+                       case 'e':       goto yy369;
                        default:        goto yy62;
                        }
-yy280:
+yy282:
                        ++cur;
                        cur -= 1;
 #line 323 "src/parser.re"
                        { char_width = 1; }
-#line 3220 "src/parser.c"
-yy282:
+#line 3298 "src/parser.c"
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy368;
+                       case 'o':       goto yy370;
                        default:        goto yy62;
                        }
-yy283:
+yy285:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy369;
+                       case 'i':       goto yy371;
                        default:        goto yy62;
                        }
-yy284:
+yy286:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy370;
+                       case 'd':       goto yy372;
                        default:        goto yy62;
                        }
-yy285:
+yy287:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy372;
+                       case 'a':       goto yy374;
                        default:        goto yy62;
                        }
-yy286:
+yy288:
                        ++cur;
                        cur -= 2;
 #line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3254 "src/parser.c"
-yy288:
+#line 3332 "src/parser.c"
+yy290:
                        ++cur;
                        cur -= 2;
 #line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3260 "src/parser.c"
-yy290:
+#line 3338 "src/parser.c"
+yy292:
                        ++cur;
                        cur -= 2;
 #line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3266 "src/parser.c"
-yy292:
+#line 3344 "src/parser.c"
+yy294:
                        ++cur;
                        cur -= 3;
 #line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3272 "src/parser.c"
-yy294:
+#line 3350 "src/parser.c"
+yy296:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3295,65 +3373,65 @@ yy294:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy294;
+                       case 'f':       goto yy296;
                        case 'P':
                        case 'p':       goto yy127;
                        default:        goto yy114;
                        }
-yy296:
+yy298:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy373;
+                       case 'y':       goto yy375;
                        default:        goto yy62;
                        }
-yy297:
+yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy375;
+                       case 'a':       goto yy377;
                        default:        goto yy62;
                        }
-yy298:
+yy300:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy376;
+                       case 'v':       goto yy378;
                        default:        goto yy62;
                        }
-yy299:
+yy301:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy377;
+                       case 'a':       goto yy379;
                        case 'B':
-                       case 'b':       goto yy378;
+                       case 'b':       goto yy380;
                        case 'O':
-                       case 'o':       goto yy379;
+                       case 'o':       goto yy381;
                        default:        goto yy62;
                        }
-yy300:
+yy302:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy380;
+                       case 't':       goto yy382;
                        default:        goto yy62;
                        }
-yy301:
+yy303:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy382;
+                       case 'n':       goto yy384;
                        default:        goto yy62;
                        }
-yy302:
-                       yyaccept = 14;
+yy304:
+                       yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3419,16 +3497,16 @@ yy302:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy303;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy305;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy303:
+yy305:
 #line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3430 "src/parser.c"
-yy304:
-                       yyaccept = 15;
+#line 3508 "src/parser.c"
+yy306:
+                       yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3494,48 +3572,48 @@ yy304:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy305;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy307;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy305:
+yy307:
 #line 394 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3505 "src/parser.c"
-yy306:
+#line 3583 "src/parser.c"
+yy308:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy383;
+                       case 'f':       goto yy385;
                        default:        goto yy62;
                        }
-yy307:
+yy309:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy385;
+                       case 'r':       goto yy387;
                        default:        goto yy62;
                        }
-yy308:
+yy310:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy387;
+                       case 'e':       goto yy389;
                        default:        goto yy62;
                        }
-yy309:
+yy311:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy389;
+                       case 't':       goto yy391;
                        default:        goto yy62;
                        }
-yy310:
-                       yyaccept = 16;
+yy312:
+                       yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3601,64 +3679,64 @@ yy310:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy311;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy313;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy311:
-#line 421 "src/parser.re"
+yy313:
+#line 422 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3612 "src/parser.c"
-yy312:
+#line 3690 "src/parser.c"
+yy314:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy390;
+                       case 't':       goto yy392;
                        default:        goto yy62;
                        }
-yy313:
+yy315:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy391;
+                       case 'f':       goto yy393;
                        default:        goto yy62;
                        }
-yy314:
+yy316:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy393;
+                       case 'e':       goto yy395;
                        default:        goto yy62;
                        }
-yy315:
+yy317:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy394;
+                       case 'u':       goto yy396;
                        default:        goto yy62;
                        }
-yy316:
+yy318:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy395;
+                       case 'a':       goto yy397;
                        default:        goto yy62;
                        }
-yy317:
+yy319:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy396;
+                       case 'd':       goto yy398;
                        default:        goto yy62;
                        }
-yy318:
-                       yyaccept = 17;
+yy320:
+                       yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3724,95 +3802,95 @@ yy318:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy319;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy321;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy319:
+yy321:
 #line 406 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3735 "src/parser.c"
-yy320:
+#line 3813 "src/parser.c"
+yy322:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy398;
+                       case 'c':       goto yy400;
                        default:        goto yy62;
                        }
-yy321:
+yy323:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy399;
+                       case 'a':       goto yy401;
                        default:        goto yy62;
                        }
-yy322:
+yy324:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy400;
+                       case 'v':       goto yy402;
                        default:        goto yy62;
                        }
-yy323:
+yy325:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy401;
+                       case '_':       goto yy403;
                        default:        goto yy62;
                        }
-yy324:
+yy326:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy402;
+                       case 'a':       goto yy404;
                        default:        goto yy62;
                        }
-yy325:
+yy327:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy403;
+                       case 'r':       goto yy405;
                        default:        goto yy62;
                        }
-yy326:
+yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy404;
+                       case 'i':       goto yy406;
                        default:        goto yy62;
                        }
-yy327:
+yy329:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy405;
+                       case 'n':       goto yy407;
                        default:        goto yy62;
                        }
-yy328:
+yy330:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy406;
+                       case 'e':       goto yy408;
                        default:        goto yy62;
                        }
-yy329:
+yy331:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy407;
+                       case 'a':       goto yy409;
                        default:        goto yy62;
                        }
-yy330:
-                       yyaccept = 18;
+yy332:
+                       yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3878,64 +3956,64 @@ yy330:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy331;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy333;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy331:
-#line 422 "src/parser.re"
+yy333:
+#line 423 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 3889 "src/parser.c"
-yy332:
+#line 3967 "src/parser.c"
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy408;
+                       case 'r':       goto yy410;
                        default:        goto yy62;
                        }
-yy333:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy409;
+                       case 'o':       goto yy411;
                        default:        goto yy62;
                        }
-yy334:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy410;
+                       case 'l':       goto yy412;
                        default:        goto yy62;
                        }
-yy335:
+yy337:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy411;
+                       case 'n':       goto yy413;
                        default:        goto yy62;
                        }
-yy336:
+yy338:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy412;
+                       case 'b':       goto yy414;
                        default:        goto yy62;
                        }
-yy337:
+yy339:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy413;
+                       case 't':       goto yy415;
                        default:        goto yy62;
                        }
-yy338:
-                       yyaccept = 19;
+yy340:
+                       yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4001,32 +4079,32 @@ yy338:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy339;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy341;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy339:
+yy341:
 #line 404 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4012 "src/parser.c"
-yy340:
+#line 4090 "src/parser.c"
+yy342:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy414;
+                       case 'f':       goto yy416;
                        default:        goto yy62;
                        }
-yy341:
+yy343:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy416;
+                       case 'i':       goto yy418;
                        default:        goto yy62;
                        }
-yy342:
-                       yyaccept = 20;
+yy344:
+                       yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4092,51 +4170,51 @@ yy342:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy343;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy345;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy343:
-#line 431 "src/parser.re"
+yy345:
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4103 "src/parser.c"
-yy344:
+#line 4181 "src/parser.c"
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy417;
+                       case 'm':       goto yy419;
                        default:        goto yy62;
                        }
-yy345:
+yy347:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy418;
+                       case 't':       goto yy420;
                        default:        goto yy62;
                        }
-yy346:
+yy348:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy419;
+                       case 't':       goto yy421;
                        default:        goto yy62;
                        }
-yy347:
+yy349:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy420;
+                       case 'l':       goto yy422;
                        default:        goto yy62;
                        }
-yy348:
+yy350:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy421;
+                       case 's':       goto yy423;
                        default:        goto yy62;
                        }
-yy349:
-                       yyaccept = 21;
+yy351:
+                       yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4202,18 +4280,18 @@ yy349:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy350;
+                       case 0x7F:      goto yy352;
                        case 'V':
-                       case 'v':       goto yy376;
-                       case '\\':      goto yy146;
+                       case 'v':       goto yy378;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy350:
+yy352:
 #line 382 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 4215 "src/parser.c"
-yy351:
-                       yyaccept = 22;
+#line 4293 "src/parser.c"
+yy353:
+                       yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4279,30 +4357,30 @@ yy351:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy352;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy354;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy352:
+yy354:
 #line 383 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 4290 "src/parser.c"
-yy353:
+#line 4368 "src/parser.c"
+yy355:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy422;
+                       case 't':       goto yy424;
                        default:        goto yy62;
                        }
-yy354:
+yy356:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy424;
+                       case 'l':       goto yy426;
                        default:        goto yy62;
                        }
-yy355:
-                       yyaccept = 23;
+yy357:
+                       yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4368,24 +4446,24 @@ yy355:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy356;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy358;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy356:
+yy358:
 #line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 4379 "src/parser.c"
-yy357:
+#line 4457 "src/parser.c"
+yy359:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':       goto yy389;
-                       case 't':       goto yy425;
+                       case 'T':       goto yy391;
+                       case 't':       goto yy427;
                        default:        goto yy62;
                        }
-yy358:
-                       yyaccept = 24;
+yy360:
+                       yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4451,16 +4529,16 @@ yy358:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy359;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy361;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy359:
+yy361:
 #line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4462 "src/parser.c"
-yy360:
-                       yyaccept = 25;
+#line 4540 "src/parser.c"
+yy362:
+                       yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4526,72 +4604,72 @@ yy360:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy361;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy363;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy361:
+yy363:
 #line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 4537 "src/parser.c"
-yy362:
+#line 4615 "src/parser.c"
+yy364:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy427;
+                       case 'm':       goto yy429;
                        default:        goto yy62;
                        }
-yy363:
+yy365:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy428;
+                       case 't':       goto yy430;
                        default:        goto yy62;
                        }
-yy364:
+yy366:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy430;
+                       case 'e':       goto yy432;
                        default:        goto yy62;
                        }
-yy365:
+yy367:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy431;
+                       case 'o':       goto yy433;
                        default:        goto yy62;
                        }
-yy366:
+yy368:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy432;
+                       case 'c':       goto yy434;
                        default:        goto yy62;
                        }
-yy367:
+yy369:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy433;
+                       case 'd':       goto yy435;
                        default:        goto yy62;
                        }
-yy368:
+yy370:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy434;
+                       case 'n':       goto yy436;
                        default:        goto yy62;
                        }
-yy369:
+yy371:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy436;
+                       case 'g':       goto yy438;
                        default:        goto yy62;
                        }
-yy370:
-                       yyaccept = 26;
+yy372:
+                       yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4657,23 +4735,23 @@ yy370:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy371;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy373;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy371:
+yy373:
 #line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4668 "src/parser.c"
-yy372:
+#line 4746 "src/parser.c"
+yy374:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy437;
+                       case 't':       goto yy439;
                        default:        goto yy62;
                        }
-yy373:
-                       yyaccept = 27;
+yy375:
+                       yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4739,56 +4817,56 @@ yy373:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy374;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy376;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy374:
+yy376:
 #line 410 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4750 "src/parser.c"
-yy375:
+#line 4828 "src/parser.c"
+yy377:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy438;
+                       case 'l':       goto yy440;
                        default:        goto yy62;
                        }
-yy376:
+yy378:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy440;
+                       case 'a':       goto yy442;
                        default:        goto yy62;
                        }
-yy377:
+yy379:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy441;
+                       case 'b':       goto yy443;
                        default:        goto yy62;
                        }
-yy378:
+yy380:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy442;
+                       case 'a':       goto yy444;
                        default:        goto yy62;
                        }
-yy379:
+yy381:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy443;
+                       case 'c':       goto yy445;
                        default:        goto yy62;
                        }
-yy380:
-                       yyaccept = 28;
+yy382:
+                       yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4854,24 +4932,24 @@ yy380:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy381;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy383;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy381:
-#line 432 "src/parser.re"
+yy383:
+#line 433 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4865 "src/parser.c"
-yy382:
+#line 4943 "src/parser.c"
+yy384:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy445;
+                       case 'e':       goto yy447;
                        default:        goto yy62;
                        }
-yy383:
-                       yyaccept = 29;
+yy385:
+                       yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4937,16 +5015,16 @@ yy383:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy384;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy386;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy384:
+yy386:
 #line 396 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4948 "src/parser.c"
-yy385:
-                       yyaccept = 30;
+#line 5026 "src/parser.c"
+yy387:
+                       yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5012,16 +5090,16 @@ yy385:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy386;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy388;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy386:
+yy388:
 #line 401 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 5023 "src/parser.c"
-yy387:
-                       yyaccept = 31;
+#line 5101 "src/parser.c"
+yy389:
+                       yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5087,32 +5165,32 @@ yy387:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy388;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy390;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy388:
+yy390:
 #line 405 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5098 "src/parser.c"
-yy389:
+#line 5176 "src/parser.c"
+yy391:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy447;
+                       case 'v':       goto yy449;
                        default:        goto yy62;
                        }
-yy390:
+yy392:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy448;
+                       case 'i':       goto yy450;
                        default:        goto yy62;
                        }
-yy391:
-                       yyaccept = 32;
+yy393:
+                       yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5178,40 +5256,40 @@ yy391:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy392;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy394;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy392:
+yy394:
 #line 392 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5189 "src/parser.c"
-yy393:
+#line 5267 "src/parser.c"
+yy395:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy449;
+                       case 'f':       goto yy451;
                        default:        goto yy62;
                        }
-yy394:
+yy396:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy451;
+                       case 'd':       goto yy453;
                        default:        goto yy62;
                        }
-yy395:
+yy397:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy452;
+                       case 'l':       goto yy454;
                        default:        goto yy62;
                        }
-yy396:
-                       yyaccept = 33;
+yy398:
+                       yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5277,144 +5355,144 @@ yy396:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy397;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy399;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy397:
+yy399:
 #line 407 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5288 "src/parser.c"
-yy398:
+#line 5366 "src/parser.c"
+yy400:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy454;
+                       case 't':       goto yy456;
                        default:        goto yy62;
                        }
-yy399:
+yy401:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy456;
+                       case 'l':       goto yy458;
                        default:        goto yy62;
                        }
-yy400:
+yy402:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy458;
+                       case 'a':       goto yy460;
                        default:        goto yy62;
                        }
-yy401:
+yy403:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy459;
+                       case 'a':       goto yy461;
                        default:        goto yy62;
                        }
-yy402:
+yy404:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy460;
+                       case 's':       goto yy462;
                        default:        goto yy62;
                        }
-yy403:
+yy405:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy461;
+                       case 'n':       goto yy463;
                        default:        goto yy62;
                        }
-yy404:
+yy406:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy463;
+                       case 'c':       goto yy465;
                        default:        goto yy62;
                        }
-yy405:
+yy407:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy465;
+                       case 'g':       goto yy467;
                        default:        goto yy62;
                        }
-yy406:
+yy408:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy467;
+                       case 'n':       goto yy469;
                        default:        goto yy62;
                        }
-yy407:
+yy409:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy469;
+                       case 'l':       goto yy471;
                        default:        goto yy62;
                        }
-yy408:
+yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy471;
+                       case 'r':       goto yy473;
                        default:        goto yy62;
                        }
-yy409:
+yy411:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy472;
+                       case 'o':       goto yy474;
                        default:        goto yy62;
                        }
-yy410:
+yy412:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy473;
+                       case 'o':       goto yy475;
                        default:        goto yy62;
                        }
-yy411:
+yy413:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy474;
+                       case 't':       goto yy476;
                        default:        goto yy62;
                        }
-yy412:
+yy414:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy476;
+                       case 'j':       goto yy478;
                        default:        goto yy62;
                        }
-yy413:
+yy415:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy477;
+                       case 'r':       goto yy479;
                        default:        goto yy62;
                        }
-yy414:
-                       yyaccept = 34;
+yy416:
+                       yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5480,59 +5558,59 @@ yy414:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy415;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy417;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy415:
+yy417:
 #line 399 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5491 "src/parser.c"
-yy416:
+#line 5569 "src/parser.c"
+yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy478;
+                       case 'n':       goto yy480;
                        default:        goto yy62;
                        }
-yy417:
+yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy479;
+                       case '_':       goto yy481;
                        default:        goto yy62;
                        }
-yy418:
+yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy480;
+                       case 'r':       goto yy482;
                        default:        goto yy62;
                        }
-yy419:
+yy421:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy481;
+                       case 'e':       goto yy483;
                        default:        goto yy62;
                        }
-yy420:
+yy422:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy482;
+                       case 'i':       goto yy484;
                        default:        goto yy62;
                        }
-yy421:
+yy423:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy483;
+                       case 't':       goto yy485;
                        default:        goto yy62;
                        }
-yy422:
-                       yyaccept = 35;
+yy424:
+                       yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5598,23 +5676,23 @@ yy422:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy423;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy425;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy423:
+yy425:
 #line 380 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 5609 "src/parser.c"
-yy424:
+#line 5687 "src/parser.c"
+yy426:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy484;
+                       case 'e':       goto yy486;
                        default:        goto yy62;
                        }
-yy425:
-                       yyaccept = 36;
+yy427:
+                       yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5680,25 +5758,25 @@ yy425:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy426;
+                       case 0x7F:      goto yy428;
                        case 'V':
-                       case 'v':       goto yy447;
-                       case '\\':      goto yy146;
+                       case 'v':       goto yy449;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy426:
+yy428:
 #line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5693 "src/parser.c"
-yy427:
+#line 5771 "src/parser.c"
+yy429:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy486;
+                       case 'a':       goto yy488;
                        default:        goto yy62;
                        }
-yy428:
-                       yyaccept = 37;
+yy430:
+                       yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5764,44 +5842,44 @@ yy428:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy429;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy431;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy429:
+yy431:
 #line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5775 "src/parser.c"
-yy430:
+#line 5853 "src/parser.c"
+yy432:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy488;
+                       case 'd':       goto yy490;
                        default:        goto yy62;
                        }
-yy431:
+yy433:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'f':       goto yy490;
+                       case 'f':       goto yy492;
                        default:        goto yy62;
                        }
-yy432:
+yy434:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy492;
+                       case 't':       goto yy494;
                        default:        goto yy62;
                        }
-yy433:
+yy435:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy494;
+                       case 'e':       goto yy496;
                        default:        goto yy62;
                        }
-yy434:
-                       yyaccept = 38;
+yy436:
+                       yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5867,30 +5945,30 @@ yy434:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy435;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy437;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy435:
+yy437:
 #line 378 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5878 "src/parser.c"
-yy436:
+#line 5956 "src/parser.c"
+yy438:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy495;
+                       case 'n':       goto yy497;
                        default:        goto yy62;
                        }
-yy437:
+yy439:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy496;
+                       case 'i':       goto yy498;
                        default:        goto yy62;
                        }
-yy438:
-                       yyaccept = 39;
+yy440:
+                       yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5956,40 +6034,40 @@ yy438:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy439;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy441;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy439:
-#line 429 "src/parser.re"
+yy441:
+#line 430 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5967 "src/parser.c"
-yy440:
+#line 6045 "src/parser.c"
+yy442:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy497;
+                       case 'l':       goto yy499;
                        default:        goto yy62;
                        }
-yy441:
+yy443:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy499;
+                       case 'l':       goto yy501;
                        default:        goto yy62;
                        }
-yy442:
+yy444:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy500;
+                       case 'c':       goto yy502;
                        default:        goto yy62;
                        }
-yy443:
-                       yyaccept = 40;
+yy445:
+                       yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6055,16 +6133,16 @@ yy443:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy444;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy446;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy444:
-#line 433 "src/parser.re"
+yy446:
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 6066 "src/parser.c"
-yy445:
-                       yyaccept = 41;
+#line 6144 "src/parser.c"
+yy447:
+                       yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6130,34 +6208,34 @@ yy445:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy446;
+                       case 0x7F:      goto yy448;
                        case 'D':
-                       case 'd':       goto yy501;
-                       case '\\':      goto yy146;
+                       case 'd':       goto yy503;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy446:
+yy448:
 #line 397 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6143 "src/parser.c"
-yy447:
+#line 6221 "src/parser.c"
+yy449:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy503;
+                       case 'a':       goto yy505;
                        default:        goto yy62;
                        }
-yy448:
+yy450:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy504;
+                       case 'o':       goto yy506;
                        default:        goto yy62;
                        }
-yy449:
-                       yyaccept = 42;
+yy451:
+                       yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6223,24 +6301,24 @@ yy449:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy450;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy452;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy450:
+yy452:
 #line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6234 "src/parser.c"
-yy451:
+#line 6312 "src/parser.c"
+yy453:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy505;
+                       case 'e':       goto yy507;
                        default:        goto yy62;
                        }
-yy452:
-                       yyaccept = 43;
+yy454:
+                       yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6306,16 +6384,16 @@ yy452:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy453;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy455;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy453:
-#line 426 "src/parser.re"
+yy455:
+#line 427 "src/parser.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6317 "src/parser.c"
-yy454:
-                       yyaccept = 44;
+#line 6395 "src/parser.c"
+yy456:
+                       yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6381,16 +6459,16 @@ yy454:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy455;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy457;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy455:
+yy457:
 #line 411 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6392 "src/parser.c"
-yy456:
-                       yyaccept = 45;
+#line 6470 "src/parser.c"
+yy458:
+                       yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6456,40 +6534,40 @@ yy456:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy457;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy459;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy457:
-#line 430 "src/parser.re"
+yy459:
+#line 431 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6467 "src/parser.c"
-yy458:
+#line 6545 "src/parser.c"
+yy460:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy507;
+                       case 'l':       goto yy509;
                        default:        goto yy62;
                        }
-yy459:
+yy461:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy509;
+                       case 's':       goto yy511;
                        default:        goto yy62;
                        }
-yy460:
+yy462:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy510;
+                       case 's':       goto yy512;
                        default:        goto yy62;
                        }
-yy461:
-                       yyaccept = 46;
+yy463:
+                       yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6555,16 +6633,16 @@ yy461:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy462;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy464;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy462:
+yy464:
 #line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6566 "src/parser.c"
-yy463:
-                       yyaccept = 47;
+#line 6644 "src/parser.c"
+yy465:
+                       yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6630,16 +6708,16 @@ yy463:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy464;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy466;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy464:
+yy466:
 #line 413 "src/parser.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6641 "src/parser.c"
-yy465:
-                       yyaccept = 48;
+#line 6719 "src/parser.c"
+yy467:
+                       yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6705,16 +6783,16 @@ yy465:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy466;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy468;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy466:
+yy468:
 #line 409 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6716 "src/parser.c"
-yy467:
-                       yyaccept = 49;
+#line 6794 "src/parser.c"
+yy469:
+                       yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6780,16 +6858,16 @@ yy467:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy468;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy470;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy468:
-#line 423 "src/parser.re"
+yy470:
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6791 "src/parser.c"
-yy469:
-                       yyaccept = 50;
+#line 6869 "src/parser.c"
+yy471:
+                       yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6855,40 +6933,40 @@ yy469:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy470;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy472;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy470:
-#line 424 "src/parser.re"
+yy472:
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 6866 "src/parser.c"
-yy471:
+#line 6944 "src/parser.c"
+yy473:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy511;
+                       case 'a':       goto yy513;
                        default:        goto yy62;
                        }
-yy472:
+yy474:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy512;
+                       case 'l':       goto yy514;
                        default:        goto yy62;
                        }
-yy473:
+yy475:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy514;
+                       case 'a':       goto yy516;
                        default:        goto yy62;
                        }
-yy474:
-                       yyaccept = 51;
+yy476:
+                       yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6954,75 +7032,75 @@ yy474:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy475;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy477;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy475:
-#line 437 "src/parser.re"
+yy477:
+#line 438 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 6965 "src/parser.c"
-yy476:
+#line 7043 "src/parser.c"
+yy478:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy515;
+                       case 'e':       goto yy517;
                        default:        goto yy62;
                        }
-yy477:
+yy479:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy516;
+                       case 'i':       goto yy518;
                        default:        goto yy62;
                        }
-yy478:
+yy480:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy517;
+                       case 'g':       goto yy519;
                        default:        goto yy62;
                        }
-yy479:
+yy481:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy519;
+                       case '_':       goto yy521;
                        default:        goto yy62;
                        }
-yy480:
+yy482:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy521;
+                       case 'i':       goto yy523;
                        default:        goto yy62;
                        }
-yy481:
+yy483:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy522;
+                       case 'n':       goto yy524;
                        default:        goto yy62;
                        }
-yy482:
+yy484:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy523;
+                       case 'n':       goto yy525;
                        default:        goto yy62;
                        }
-yy483:
+yy485:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy524;
+                       case 'r':       goto yy526;
                        default:        goto yy62;
                        }
-yy484:
-                       yyaccept = 52;
+yy486:
+                       yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7088,16 +7166,16 @@ yy484:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy485;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy487;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy485:
+yy487:
 #line 388 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 7099 "src/parser.c"
-yy486:
-                       yyaccept = 53;
+#line 7177 "src/parser.c"
+yy488:
+                       yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7163,16 +7241,16 @@ yy486:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy487;
-                       case '\\':      goto yy146;
-                       default:        goto yy525;
+                       case 0x7F:      goto yy489;
+                       case '\\':      goto yy148;
+                       default:        goto yy527;
                        }
-yy487:
+yy489:
 #line 367 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7174 "src/parser.c"
-yy488:
-                       yyaccept = 54;
+#line 7252 "src/parser.c"
+yy490:
+                       yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7238,16 +7316,16 @@ yy488:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy489;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy491;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy489:
+yy491:
 #line 390 "src/parser.re"
                        { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 7249 "src/parser.c"
-yy490:
-                       yyaccept = 55;
+#line 7327 "src/parser.c"
+yy492:
+                       yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7313,16 +7391,16 @@ yy490:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy491;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy493;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy491:
+yy493:
 #line 374 "src/parser.re"
                        { NEWTOKEN(PSI_T_SIZEOF); goto start; }
-#line 7324 "src/parser.c"
-yy492:
-                       yyaccept = 56;
+#line 7402 "src/parser.c"
+yy494:
+                       yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7388,37 +7466,37 @@ yy492:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy493;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy495;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy493:
+yy495:
 #line 377 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7399 "src/parser.c"
-yy494:
+#line 7477 "src/parser.c"
+yy496:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'f':       goto yy527;
+                       case 'f':       goto yy529;
                        default:        goto yy62;
                        }
-yy495:
+yy497:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy529;
+                       case 'e':       goto yy531;
                        default:        goto yy62;
                        }
-yy496:
+yy498:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy530;
+                       case 'l':       goto yy532;
                        default:        goto yy62;
                        }
-yy497:
-                       yyaccept = 57;
+yy499:
+                       yyaccept = 58;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7484,32 +7562,32 @@ yy497:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy498;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy500;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy498:
-#line 428 "src/parser.re"
+yy500:
+#line 429 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7495 "src/parser.c"
-yy499:
+#line 7573 "src/parser.c"
+yy501:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy531;
+                       case 'e':       goto yy533;
                        default:        goto yy62;
                        }
-yy500:
+yy502:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'K':
-                       case 'k':       goto yy533;
+                       case 'k':       goto yy535;
                        default:        goto yy62;
                        }
-yy501:
-                       yyaccept = 58;
+yy503:
+                       yyaccept = 59;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7575,32 +7653,32 @@ yy501:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy502;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy504;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy502:
+yy504:
 #line 398 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7586 "src/parser.c"
-yy503:
+#line 7664 "src/parser.c"
+yy505:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy535;
+                       case 'l':       goto yy537;
                        default:        goto yy62;
                        }
-yy504:
+yy506:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy537;
+                       case 'n':       goto yy539;
                        default:        goto yy62;
                        }
-yy505:
-                       yyaccept = 59;
+yy507:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7666,17 +7744,17 @@ yy505:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy506;
-                       case '\\':      goto yy146;
-                       case '_':       goto yy539;
+                       case 0x7F:      goto yy508;
+                       case '\\':      goto yy148;
+                       case '_':       goto yy541;
                        default:        goto yy61;
                        }
-yy506:
+yy508:
 #line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7678 "src/parser.c"
-yy507:
-                       yyaccept = 60;
+#line 7756 "src/parser.c"
+yy509:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7742,40 +7820,40 @@ yy507:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy508;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy510;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy508:
-#line 425 "src/parser.re"
+yy510:
+#line 426 "src/parser.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7753 "src/parser.c"
-yy509:
+#line 7831 "src/parser.c"
+yy511:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy540;
+                       case 's':       goto yy542;
                        default:        goto yy62;
                        }
-yy510:
+yy512:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy541;
+                       case 'e':       goto yy543;
                        default:        goto yy62;
                        }
-yy511:
+yy513:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy542;
+                       case 'y':       goto yy544;
                        default:        goto yy62;
                        }
-yy512:
-                       yyaccept = 61;
+yy514:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7841,40 +7919,40 @@ yy512:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy513;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy515;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy513:
-#line 439 "src/parser.re"
+yy515:
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 7852 "src/parser.c"
-yy514:
+#line 7930 "src/parser.c"
+yy516:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy544;
+                       case 't':       goto yy546;
                        default:        goto yy62;
                        }
-yy515:
+yy517:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy546;
+                       case 'c':       goto yy548;
                        default:        goto yy62;
                        }
-yy516:
+yy518:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy547;
+                       case 'n':       goto yy549;
                        default:        goto yy62;
                        }
-yy517:
-                       yyaccept = 62;
+yy519:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7940,16 +8018,16 @@ yy517:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy518;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy520;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy518:
+yy520:
 #line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 7951 "src/parser.c"
-yy519:
-                       yyaccept = 63;
+#line 8029 "src/parser.c"
+yy521:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8015,43 +8093,43 @@ yy519:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy520;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy522;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy520:
+yy522:
 #line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8026 "src/parser.c"
-yy521:
+#line 8104 "src/parser.c"
+yy523:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy548;
+                       case 'b':       goto yy550;
                        default:        goto yy62;
                        }
-yy522:
+yy524:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy549;
+                       case 's':       goto yy551;
                        default:        goto yy62;
                        }
-yy523:
+yy525:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy550;
+                       case 'e':       goto yy552;
                        default:        goto yy62;
                        }
-yy524:
+yy526:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy552;
+                       case 'i':       goto yy554;
                        default:        goto yy62;
                        }
-yy525:
+yy527:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -8121,12 +8199,12 @@ yy525:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
-                       case 'o':       goto yy553;
-                       default:        goto yy525;
+                       case '\\':      goto yy148;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
                        }
-yy527:
-                       yyaccept = 64;
+yy529:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8192,30 +8270,30 @@ yy527:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy528;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy530;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy528:
+yy530:
 #line 376 "src/parser.re"
                        { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8203 "src/parser.c"
-yy529:
+#line 8281 "src/parser.c"
+yy531:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy555;
+                       case 'd':       goto yy557;
                        default:        goto yy62;
                        }
-yy530:
+yy532:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy557;
+                       case 'e':       goto yy559;
                        default:        goto yy62;
                        }
-yy531:
-                       yyaccept = 65;
+yy533:
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8281,16 +8359,16 @@ yy531:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy532;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy534;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy532:
+yy534:
 #line 408 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8292 "src/parser.c"
-yy533:
-                       yyaccept = 66;
+#line 8370 "src/parser.c"
+yy535:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8356,16 +8434,16 @@ yy533:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy534;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy536;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy534:
+yy536:
 #line 412 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8367 "src/parser.c"
-yy535:
-                       yyaccept = 67;
+#line 8445 "src/parser.c"
+yy537:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8431,16 +8509,16 @@ yy535:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy536;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy538;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy536:
-#line 427 "src/parser.re"
+yy538:
+#line 428 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8442 "src/parser.c"
-yy537:
-                       yyaccept = 68;
+#line 8520 "src/parser.c"
+yy539:
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8506,40 +8584,40 @@ yy537:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy538;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy540;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy538:
+yy540:
 #line 414 "src/parser.re"
                        { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8517 "src/parser.c"
-yy539:
+#line 8595 "src/parser.c"
+yy541:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy559;
+                       case 'n':       goto yy561;
                        default:        goto yy62;
                        }
-yy540:
+yy542:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy560;
+                       case 'e':       goto yy562;
                        default:        goto yy62;
                        }
-yy541:
+yy543:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy561;
+                       case 'r':       goto yy563;
                        default:        goto yy62;
                        }
-yy542:
-                       yyaccept = 69;
+yy544:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8605,16 +8683,16 @@ yy542:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy543;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy545;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy543:
-#line 435 "src/parser.re"
+yy545:
+#line 436 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 8616 "src/parser.c"
-yy544:
-                       yyaccept = 70;
+#line 8694 "src/parser.c"
+yy546:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8680,46 +8758,46 @@ yy544:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy545;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy547;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy545:
-#line 438 "src/parser.re"
+yy547:
+#line 439 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 8691 "src/parser.c"
-yy546:
+#line 8769 "src/parser.c"
+yy548:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy562;
+                       case 't':       goto yy564;
                        default:        goto yy62;
                        }
-yy547:
+yy549:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy564;
+                       case 'g':       goto yy566;
                        default:        goto yy62;
                        }
-yy548:
+yy550:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy566;
+                       case 'u':       goto yy568;
                        default:        goto yy62;
                        }
-yy549:
+yy551:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy567;
+                       case 'i':       goto yy569;
                        default:        goto yy62;
                        }
-yy550:
-                       yyaccept = 71;
+yy552:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8785,22 +8863,22 @@ yy550:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy551;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy553;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy551:
+yy553:
 #line 369 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
-#line 8796 "src/parser.c"
-yy552:
+#line 8874 "src/parser.c"
+yy554:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy568;
+                       case 'c':       goto yy570;
                        default:        goto yy62;
                        }
-yy553:
+yy555:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -8870,13 +8948,13 @@ yy553:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
-                       case 'n':       goto yy569;
-                       case 'o':       goto yy553;
-                       default:        goto yy525;
+                       case '\\':      goto yy148;
+                       case 'n':       goto yy571;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
                        }
-yy555:
-                       yyaccept = 72;
+yy557:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8942,16 +9020,16 @@ yy555:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy556;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy558;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy556:
+yy558:
 #line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 8953 "src/parser.c"
-yy557:
-                       yyaccept = 73;
+#line 9031 "src/parser.c"
+yy559:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9017,40 +9095,40 @@ yy557:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy558;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy560;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy558:
+yy560:
 #line 373 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOLATILE); goto start; }
-#line 9028 "src/parser.c"
-yy559:
+#line 9106 "src/parser.c"
+yy561:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy570;
+                       case 'e':       goto yy572;
                        default:        goto yy62;
                        }
-yy560:
+yy562:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy571;
+                       case 'r':       goto yy573;
                        default:        goto yy62;
                        }
-yy561:
+yy563:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy572;
+                       case 't':       goto yy574;
                        default:        goto yy62;
                        }
-yy562:
-                       yyaccept = 74;
+yy564:
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9116,16 +9194,16 @@ yy562:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy563;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy565;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy563:
-#line 434 "src/parser.re"
+yy565:
+#line 435 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9127 "src/parser.c"
-yy564:
-                       yyaccept = 75;
+#line 9205 "src/parser.c"
+yy566:
+                       yyaccept = 76;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9191,36 +9269,36 @@ yy564:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy565;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy567;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy565:
-#line 436 "src/parser.re"
+yy567:
+#line 437 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9202 "src/parser.c"
-yy566:
+#line 9280 "src/parser.c"
+yy568:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy574;
+                       case 't':       goto yy576;
                        default:        goto yy62;
                        }
-yy567:
+yy569:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy575;
+                       case 'o':       goto yy577;
                        default:        goto yy62;
                        }
-yy568:
+yy570:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy576;
+                       case 't':       goto yy578;
                        default:        goto yy62;
                        }
-yy569:
+yy571:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -9290,29 +9368,29 @@ yy569:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
-                       case 'c':       goto yy578;
-                       case 'o':       goto yy553;
-                       default:        goto yy525;
+                       case '\\':      goto yy148;
+                       case 'c':       goto yy580;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
                        }
-yy570:
+yy572:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy579;
+                       case 'x':       goto yy581;
                        default:        goto yy62;
                        }
-yy571:
+yy573:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy580;
+                       case 't':       goto yy582;
                        default:        goto yy62;
                        }
-yy572:
-                       yyaccept = 76;
+yy574:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9378,30 +9456,30 @@ yy572:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy573;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy575;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy573:
+yy575:
 #line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9389 "src/parser.c"
-yy574:
+#line 9467 "src/parser.c"
+yy576:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy582;
+                       case 'e':       goto yy584;
                        default:        goto yy62;
                        }
-yy575:
+yy577:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy583;
+                       case 'n':       goto yy585;
                        default:        goto yy62;
                        }
-yy576:
-                       yyaccept = 77;
+yy578:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9467,15 +9545,15 @@ yy576:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy577;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy579;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy577:
+yy579:
 #line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9478 "src/parser.c"
-yy578:
+#line 9556 "src/parser.c"
+yy580:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -9545,21 +9623,21 @@ yy578:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
-                       case 'e':       goto yy584;
-                       case 'o':       goto yy553;
-                       default:        goto yy525;
+                       case '\\':      goto yy148;
+                       case 'e':       goto yy586;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
                        }
-yy579:
+yy581:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy586;
+                       case 't':       goto yy588;
                        default:        goto yy62;
                        }
-yy580:
-                       yyaccept = 78;
+yy582:
+                       yyaccept = 79;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9625,30 +9703,30 @@ yy580:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy581;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy583;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy581:
+yy583:
 #line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 9636 "src/parser.c"
-yy582:
+#line 9714 "src/parser.c"
+yy584:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy588;
+                       case '_':       goto yy590;
                        default:        goto yy62;
                        }
-yy583:
+yy585:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy589;
+                       case '_':       goto yy591;
                        default:        goto yy62;
                        }
-yy584:
-                       yyaccept = 79;
+yy586:
+                       yyaccept = 80;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -9716,17 +9794,17 @@ yy584:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy585;
-                       case '\\':      goto yy146;
-                       case 'o':       goto yy553;
-                       default:        goto yy525;
+                       case 0x7F:      goto yy587;
+                       case '\\':      goto yy148;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
                        }
-yy585:
+yy587:
 #line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 9728 "src/parser.c"
-yy586:
-                       yyaccept = 80;
+#line 9806 "src/parser.c"
+yy588:
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9792,40 +9870,40 @@ yy586:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy587;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy589;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy587:
+yy589:
 #line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 9803 "src/parser.c"
-yy588:
+#line 9881 "src/parser.c"
+yy590:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy590;
+                       case '_':       goto yy592;
                        default:        goto yy62;
                        }
-yy589:
+yy591:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy591;
+                       case '_':       goto yy593;
                        default:        goto yy62;
                        }
-yy590:
+yy592:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy593;
-                       case '(':       goto yy595;
+                       case ' ':       goto yy595;
+                       case '(':       goto yy597;
                        default:        goto yy62;
                        }
-yy591:
-                       yyaccept = 81;
+yy593:
+                       yyaccept = 82;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9891,67 +9969,67 @@ yy591:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy592;
-                       case '\\':      goto yy146;
+                       case 0x7F:      goto yy594;
+                       case '\\':      goto yy148;
                        default:        goto yy61;
                        }
-yy592:
+yy594:
 #line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 9902 "src/parser.c"
-yy593:
+#line 9980 "src/parser.c"
+yy595:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy593;
-                       case '(':       goto yy595;
+                       case ' ':       goto yy595;
+                       case '(':       goto yy597;
                        default:        goto yy114;
                        }
-yy595:
+yy597:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy596;
+                       case '(':       goto yy598;
                        default:        goto yy114;
                        }
-yy596:
+yy598:
                        ++cur;
-#line 444 "src/parser.re"
+#line 445 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 9924 "src/parser.c"
+#line 10002 "src/parser.c"
                }
-#line 450 "src/parser.re"
+#line 451 "src/parser.re"
 
 
        character: ;
                
-#line 9931 "src/parser.c"
+#line 10009 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy602;
-                       case '\'':      goto yy604;
-                       case '\\':      goto yy606;
-                       default:        goto yy600;
+                       case '\r':      goto yy604;
+                       case '\'':      goto yy606;
+                       case '\\':      goto yy608;
+                       default:        goto yy602;
                        }
-yy600:
+yy602:
                        ++cur;
-#line 468 "src/parser.re"
+#line 469 "src/parser.re"
                        { escaped = false; goto character; }
-#line 9947 "src/parser.c"
-yy602:
+#line 10025 "src/parser.c"
+yy604:
                        ++cur;
-#line 455 "src/parser.re"
+#line 456 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 9952 "src/parser.c"
-yy604:
+#line 10030 "src/parser.c"
+yy606:
                        ++cur;
-#line 457 "src/parser.re"
+#line 458 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -9963,43 +10041,43 @@ yy604:
                        token->flags = char_width;
                        goto start;
                }
-#line 9967 "src/parser.c"
-yy606:
+#line 10045 "src/parser.c"
+yy608:
                        ++cur;
-#line 456 "src/parser.re"
+#line 457 "src/parser.re"
                        { escaped = !escaped;  goto character; }
-#line 9972 "src/parser.c"
+#line 10050 "src/parser.c"
                }
-#line 470 "src/parser.re"
+#line 471 "src/parser.re"
 
 
        string: ;
                
-#line 9979 "src/parser.c"
+#line 10057 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy612;
-                       case '"':       goto yy614;
-                       case '\\':      goto yy616;
-                       default:        goto yy610;
+                       case '\r':      goto yy614;
+                       case '"':       goto yy616;
+                       case '\\':      goto yy618;
+                       default:        goto yy612;
                        }
-yy610:
+yy612:
                        ++cur;
-#line 488 "src/parser.re"
+#line 489 "src/parser.re"
                        { escaped = false; goto string; }
-#line 9995 "src/parser.c"
-yy612:
+#line 10073 "src/parser.c"
+yy614:
                        ++cur;
-#line 475 "src/parser.re"
+#line 476 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10000 "src/parser.c"
-yy614:
+#line 10078 "src/parser.c"
+yy616:
                        ++cur;
-#line 477 "src/parser.re"
+#line 478 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10011,118 +10089,118 @@ yy614:
                        token->flags = char_width;
                        goto start;
                }
-#line 10015 "src/parser.c"
-yy616:
+#line 10093 "src/parser.c"
+yy618:
                        ++cur;
-#line 476 "src/parser.re"
+#line 477 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10020 "src/parser.c"
+#line 10098 "src/parser.c"
                }
-#line 490 "src/parser.re"
+#line 491 "src/parser.re"
 
 
        comment: ;
                
-#line 10027 "src/parser.c"
+#line 10105 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy622;
-                       case '*':       goto yy624;
-                       default:        goto yy620;
+                       case '\r':      goto yy624;
+                       case '*':       goto yy626;
+                       default:        goto yy622;
                        }
-yy620:
+yy622:
                        ++cur;
-yy621:
-#line 497 "src/parser.re"
+yy623:
+#line 498 "src/parser.re"
                        { goto comment; }
-#line 10043 "src/parser.c"
-yy622:
+#line 10121 "src/parser.c"
+yy624:
                        ++cur;
-#line 495 "src/parser.re"
+#line 496 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10048 "src/parser.c"
-yy624:
+#line 10126 "src/parser.c"
+yy626:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy625;
-                       default:        goto yy621;
+                       case '/':       goto yy627;
+                       default:        goto yy623;
                        }
-yy625:
+yy627:
                        ++cur;
-#line 496 "src/parser.re"
+#line 497 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10059 "src/parser.c"
+#line 10137 "src/parser.c"
                }
-#line 499 "src/parser.re"
+#line 500 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10066 "src/parser.c"
+#line 10144 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy631;
-                       default:        goto yy629;
+                       case '\r':      goto yy633;
+                       default:        goto yy631;
                        }
-yy629:
+yy631:
                        ++cur;
-#line 505 "src/parser.re"
+#line 506 "src/parser.re"
                        { goto comment_sl; }
-#line 10080 "src/parser.c"
-yy631:
+#line 10158 "src/parser.c"
+yy633:
                        ++cur;
-#line 504 "src/parser.re"
+#line 505 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10085 "src/parser.c"
+#line 10163 "src/parser.c"
                }
-#line 507 "src/parser.re"
+#line 508 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10093 "src/parser.c"
+#line 10171 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy637;
-                       case '(':       goto yy639;
-                       case ')':       goto yy641;
-                       default:        goto yy635;
+                       case '\r':      goto yy639;
+                       case '(':       goto yy641;
+                       case ')':       goto yy643;
+                       default:        goto yy637;
                        }
-yy635:
-                       ++cur;
-#line 516 "src/parser.re"
-                       { goto cpp_attribute; }
-#line 10109 "src/parser.c"
 yy637:
                        ++cur;
-#line 515 "src/parser.re"
-                       { NEWLINE(); goto cpp_attribute; }
-#line 10114 "src/parser.c"
+#line 517 "src/parser.re"
+                       { goto cpp_attribute; }
+#line 10187 "src/parser.c"
 yy639:
                        ++cur;
-#line 513 "src/parser.re"
-                       { ++parens; goto cpp_attribute; }
-#line 10119 "src/parser.c"
+#line 516 "src/parser.re"
+                       { NEWLINE(); goto cpp_attribute; }
+#line 10192 "src/parser.c"
 yy641:
                        ++cur;
 #line 514 "src/parser.re"
+                       { ++parens; goto cpp_attribute; }
+#line 10197 "src/parser.c"
+yy643:
+                       ++cur;
+#line 515 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10124 "src/parser.c"
+#line 10202 "src/parser.c"
                }
-#line 518 "src/parser.re"
+#line 519 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser.re b/src/parser.re
index 9d8288eb90287e523c08e91f81b39827c0f00834..b70022ca99cf5d36f011700051c72ff1e19d442b 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -418,6 +418,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                'PRE_ASSERT'    { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
                'POST_ASSERT'   { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
                'RETURN'                { NEWTOKEN(PSI_T_RETURN); goto start; }
+               'AS'                    { NEWTOKEN(PSI_T_AS); goto start; }
                'FREE'                  { NEWTOKEN(PSI_T_FREE); goto start; }
                'TEMP'                  { NEWTOKEN(PSI_T_TEMP); goto start; }
                'STRLEN'                { NEWTOKEN(PSI_T_STRLEN); goto start; }

diff --git a/src/parser_proc.c b/src/parser_proc.c
index 076c6c7660fb4d1ab83ae185e46f037d7e622305..d6777076d745e75baf872470269ad2202c9c7acb 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -274,18 +274,18 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  168
+#define YYFINAL  169
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3607
+#define YYLAST   3764
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  127
+#define YYNTOKENS  128
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  133
+#define YYNNTS  135
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  615
+#define YYNRULES  624
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  866
+#define YYNSTATES  879
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule.  */
 #define YYMAXRHS 13
 /* YYMAXLEFT -- Maximum number of symbols to the left of a handle
@@ -294,7 +294,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   381
+#define YYMAXUTOK   382
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -340,75 +340,76 @@ static const unsigned char yytranslate[] =
       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
+     125,   126,   127
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     377,   377,   377,   377,   378,   378,   378,   378,   378,   378,
-     378,   378,   378,   378,   378,   378,   378,   378,   378,   378,
-     378,   378,   379,   379,   379,   379,   379,   379,   379,   379,
+       0,   379,   379,   379,   379,   379,   379,   379,   379,   379,
      379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
-     379,   379,   379,   379,   379,   379,   379,   379,   379,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
-     380,   380,   380,   380,   384,   385,   388,   389,   392,   393,
-     394,   395,   401,   409,   412,   415,   416,   417,   420,   423,
-     426,   429,   435,   441,   444,   450,   473,   477,   481,   486,
-     490,   494,   498,   505,   506,   510,   511,   515,   516,   517,
-     521,   522,   526,   527,   531,   532,   533,   537,   538,   542,
-     543,   544,   545,   546,   547,   548,   552,   557,   565,   568,
-     571,   572,   578,   583,   591,   594,   598,   602,   609,   613,
-     617,   621,   626,   636,   646,   651,   656,   660,   666,   675,
-     678,   682,   686,   692,   699,   705,   706,   707,   708,   712,
-     715,   746,   753,   754,   755,   756,   760,   763,   772,   778,
-     781,   787,   790,   796,   797,   805,   816,   825,   837,   838,
-     842,   852,   861,   873,   876,   879,   883,   887,   891,   896,
-     901,   909,   910,   911,   917,   920,   923,   929,   930,   934,
-     937,   940,   946,   949,   952,   960,   972,   975,   978,   985,
-     988,   998,  1001,  1004,  1007,  1008,  1009,  1013,  1016,  1019,
-    1030,  1033,  1039,  1040,  1044,  1045,  1049,  1053,  1059,  1060,
-    1066,  1069,  1075,  1078,  1081,  1087,  1091,  1092,  1096,  1097,
-    1101,  1102,  1109,  1110,  1114,  1121,  1132,  1139,  1150,  1157,
-    1168,  1179,  1193,  1194,  1206,  1209,  1212,  1215,  1222,  1225,
-    1231,  1240,  1252,  1260,  1263,  1273,  1286,  1291,  1299,  1309,
-    1319,  1322,  1326,  1332,  1346,  1363,  1366,  1372,  1379,  1389,
-    1396,  1399,  1405,  1410,  1418,  1422,  1426,  1430,  1434,  1438,
-    1445,  1449,  1453,  1457,  1461,  1467,  1471,  1478,  1481,  1492,
-    1496,  1500,  1506,  1519,  1532,  1545,  1548,  1555,  1558,  1561,
-    1564,  1570,  1574,  1581,  1584,  1587,  1597,  1600,  1606,  1607,
-    1613,  1616,  1622,  1623,  1633,  1636,  1643,  1648,  1653,  1663,
-    1666,  1672,  1675,  1681,  1688,  1695,  1696,  1697,  1698,  1699,
-    1700,  1701,  1702,  1703,  1707,  1710,  1716,  1719,  1722,  1725,
-    1728,  1734,  1738,  1746,  1747,  1751,  1758,  1761,  1764,  1768,
-    1771,  1774,  1780,  1784,  1792,  1799,  1807,  1815,  1816,  1817,
-    1818,  1819,  1820,  1821,  1822,  1823,  1824,  1828,  1831,  1837,
-    1840,  1846,  1847,  1851,  1854,  1860,  1863,  1869,  1876,  1883,
-    1886,  1889,  1896,  1901,  1909,  1910,  1911,  1912,  1913,  1914,
-    1915,  1916,  1920,  1923,  1929,  1932,  1938,  1945,  1946,  1950,
-    1957,  1960,  1966,  1974,  1977,  1983
+     380,   380,   380,   380,   381,   381,   381,   381,   381,   381,
+     381,   381,   381,   381,   381,   381,   381,   381,   381,   381,
+     381,   381,   381,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   387,   388,   391,
+     392,   395,   396,   397,   398,   404,   412,   415,   418,   419,
+     420,   423,   426,   429,   432,   438,   444,   447,   453,   476,
+     480,   484,   489,   493,   497,   501,   508,   509,   513,   514,
+     518,   519,   520,   524,   525,   529,   530,   534,   535,   536,
+     540,   541,   545,   546,   547,   548,   549,   550,   551,   555,
+     560,   568,   571,   574,   575,   581,   586,   594,   597,   601,
+     605,   612,   616,   620,   624,   629,   639,   649,   654,   659,
+     663,   669,   678,   681,   685,   689,   695,   702,   708,   709,
+     710,   711,   715,   718,   749,   756,   757,   758,   759,   763,
+     766,   775,   781,   784,   790,   793,   799,   800,   808,   819,
+     828,   840,   841,   845,   855,   864,   876,   879,   882,   886,
+     890,   894,   899,   904,   912,   913,   914,   920,   923,   926,
+     932,   933,   937,   940,   943,   949,   952,   955,   963,   975,
+     978,   981,   988,   991,  1001,  1004,  1007,  1010,  1011,  1012,
+    1016,  1019,  1022,  1033,  1036,  1042,  1043,  1047,  1048,  1052,
+    1056,  1062,  1063,  1069,  1072,  1078,  1081,  1084,  1090,  1094,
+    1095,  1099,  1100,  1104,  1105,  1112,  1113,  1117,  1124,  1135,
+    1142,  1153,  1160,  1171,  1182,  1196,  1197,  1209,  1212,  1215,
+    1218,  1225,  1228,  1234,  1243,  1255,  1263,  1266,  1276,  1289,
+    1294,  1302,  1312,  1322,  1325,  1329,  1335,  1349,  1366,  1369,
+    1375,  1382,  1392,  1399,  1402,  1408,  1413,  1421,  1425,  1429,
+    1433,  1437,  1441,  1448,  1452,  1456,  1460,  1464,  1468,  1474,
+    1478,  1485,  1488,  1499,  1503,  1507,  1513,  1526,  1539,  1552,
+    1555,  1562,  1565,  1568,  1571,  1577,  1581,  1588,  1591,  1594,
+    1604,  1607,  1613,  1614,  1620,  1623,  1629,  1630,  1640,  1643,
+    1650,  1655,  1660,  1670,  1673,  1679,  1682,  1688,  1695,  1702,
+    1703,  1704,  1705,  1706,  1707,  1708,  1709,  1710,  1714,  1717,
+    1723,  1726,  1729,  1732,  1735,  1741,  1745,  1753,  1754,  1758,
+    1765,  1768,  1771,  1774,  1778,  1781,  1787,  1791,  1799,  1806,
+    1814,  1822,  1823,  1824,  1825,  1826,  1827,  1828,  1829,  1830,
+    1831,  1835,  1838,  1844,  1847,  1853,  1854,  1858,  1861,  1867,
+    1870,  1876,  1883,  1887,  1894,  1897,  1900,  1906,  1913,  1916,
+    1919,  1926,  1931,  1939,  1940,  1941,  1942,  1943,  1944,  1945,
+    1946,  1950,  1953,  1959,  1962,  1968,  1975,  1976,  1980,  1987,
+    1990,  1996,  2004,  2007,  2013
 };
 #endif
 
@@ -430,7 +431,7 @@ static const char *const yytname[] =
   "WARNING", "IF", "IFDEF", "IFNDEF", "ELSE", "ELIF", "ENDIF", "DEFINE",
   "DEFINED", "UNDEF", "IMPORT", "INCLUDE", "INCLUDE_NEXT", "TYPEDEF",
   "STRUCT", "UNION", "ENUM", "CONST", "LIB", "STATIC", "CALLBACK",
-  "FUNCTION", "LET", "SET", "TEMP", "FREE", "RETURN", "PRE_ASSERT",
+  "FUNCTION", "LET", "SET", "TEMP", "FREE", "RETURN", "AS", "PRE_ASSERT",
   "POST_ASSERT", "BOOLVAL", "INTVAL", "STRVAL", "PATHVAL", "STRLEN",
   "FLOATVAL", "ARRVAL", "OBJVAL", "COUNT", "CALLOC", "TO_BOOL", "TO_INT",
   "TO_STRING", "TO_FLOAT", "TO_ARRAY", "TO_OBJECT", "COMMENT",
@@ -467,106 +468,108 @@ static const char *const yytname[] =
   "let_exp_byref", "let_exp_assign", "let_calloc", "let_callback",
   "let_func", "let_func_token", "let_func_exps", "let_exps",
   "callback_rval", "callback_arg_list", "callback_args", "return_stmt",
-  "set_stmt", "set_exp", "set_func", "set_func_token", "set_func_exps",
-  "set_exps", "assert_stmt", "assert_stmt_token", "free_stmt", "free_exps",
-  "free_exp", "reference", "byref", YY_NULLPTR
+  "return_exp", "call_decl_vars", "set_stmt", "set_exp", "set_func",
+  "set_func_token", "set_func_exps", "set_exps", "assert_stmt",
+  "assert_stmt_token", "free_stmt", "free_exps", "free_exp", "reference",
+  "byref", YY_NULLPTR
 };
 #endif
 
-#define YYPACT_NINF -695
-#define YYTABLE_NINF -614
+#define YYPACT_NINF -692
+#define YYTABLE_NINF -623
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     659,  -695,  -695,  -695,  -695,  -695,    74,  -695,  -695,  2580,
-    1495,  1940,  -695,  -695,   696,  1314,  3317,  3317,  3317,    62,
-      36,   259,    43,  -695,  1411,  1639,    97,   659,  -695,  -695,
-    -695,  -695,  -695,  2804,  -695,  -695,  -695,  -695,   110,   168,
-    -695,  -695,  -695,    44,  -695,   -17,  -695,  -695,   133,    71,
-      77,  -695,  -695,  -695,  -695,    84,  -695,    90,  -695,  -695,
-    -695,  -695,  -695,   818,  -695,    86,    46,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  2916,     0,  -695,  -695,
-    -695,  -695,  3317,  3317,  3317,   706,  -695,    57,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,   444,  -695,  -695,  -695,  -695,   107,   943,   943,    33,
-    -695,   444,  2468,  2580,  3317,  3317,  1975,   112,  -695,  -695,
-    -695,   118,  3317,   122,   122,   125,   125,   126,  -695,  -695,
-     145,   169,  -695,    86,   173,  -695,  -695,   180,  1639,   182,
-     184,  -695,   198,  -695,  2199,  1340,   -17,   182,  -695,  -695,
-     186,  -695,   190,  3317,  -695,   220,  -695,    54,  -695,  -695,
-     110,  -695,  -695,   196,   199,  2311,  2311,  3317,   164,  3317,
-    -695,  -695,    86,  -695,  -695,  -695,  -695,  -695,  -695,  2804,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,   114,   943,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-     943,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,    50,
-    2468,  -695,  -695,  -695,  -695,  3028,  2468,   200,  3470,  -695,
-     203,   135,  -695,   144,  -695,  -695,  -695,  -695,   192,   201,
-     201,    75,    75,  3140,   204,  -695,   182,  1193,  -695,   164,
-     207,   209,   210,  -695,  2132,  -695,    86,   186,  -695,  -695,
-    -695,   237,  -695,  -695,   219,  -695,    29,  2423,  2804,   153,
-    -695,  -695,   165,   212,    88,  -695,  2804,  2244,  2804,  3317,
-     137,  -695,  -695,   296,  -695,  -695,  -695,  -695,  -695,  2356,
-    -695,   221,  3317,   238,  -695,  3317,   239,  -695,  -695,  -695,
-    -695,   498,   231,  -695,  2785,  3317,  -695,  -695,  2468,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  2468,  2468,  -695,
-     241,  1366,  2804,  2804,  -695,  -695,  -695,  -695,    86,  -695,
-    1572,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  1068,
-    -695,   385,  1429,  -695,  -695,  -695,  -695,  -695,  1460,  -695,
-    2356,  -695,  3446,  -695,  -695,  3317,  -695,  -695,  -695,    79,
-    2916,    86,   190,   186,  1605,   186,  1829,  2356,  3317,  -695,
-     234,   244,  3494,   240,   246,  -695,   247,   254,   242,   251,
-     108,  -695,  -695,   253,   247,  -695,  -695,   754,  -695,   252,
-    2804,  3199,    86,   256,  -695,  -695,  -695,   257,  3470,   258,
-     269,  3397,  -695,   261,  1975,   270,  -695,  -695,  2692,   612,
-    3317,   122,   122,  -695,  -695,  3317,  -695,  -695,  -695,  -695,
-     273,  -695,  3494,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -695,  -695,  -695,  -695,   271,   170,  -695,    43,  -695,
-     275,  1940,   276,  2907,  -695,  -695,  2356,  2356,   277,  -695,
-    -695,  3140,  -695,    29,   279,  -695,  -695,   280,  3494,  -695,
-    1684,  -695,  2244,  -695,  2804,  -695,    43,  2804,  -695,  3317,
-    -695,  -695,  -695,  -695,  -695,  -695,   281,   282,  -695,  -695,
-    -695,  -695,  2468,  2468,   283,  -695,    55,   287,  -695,   270,
-     201,   201,   289,  -695,   354,   288,   354,   284,  2356,  -695,
-    3422,  -695,  -695,   186,   186,  -695,   179,   195,   260,  3494,
-    -695,  -695,  -695,  -695,   293,  1796,  -695,   294,  2804,   172,
-    -695,   943,  3258,  3470,  3518,   304,   302,   306,  2804,   309,
-     287,  2804,  2804,  -695,  -695,   354,  -695,    43,  1572,  -695,
-    2356,  -695,  -695,   260,  -695,  -695,  -695,  -695,   315,  2356,
-      43,  -695,  1908,   316,   320,  -695,  -695,  -695,  -695,   319,
-     318,   329,   270,   322,  -695,   327,  -695,    24,  -695,  3542,
-      43,  3131,   328,   339,  -695,   342,  -695,  -695,  -695,   345,
-     346,  -695,  2804,  -695,   337,   347,  2356,  1684,   349,  -695,
-    2244,   358,   359,   270,   363,  2020,  3019,   234,  -695,  -695,
-    -695,   364,  1796,  -695,  -695,   365,   371,  -695,   362,   372,
-     373,  -695,  -695,  1684,  -695,   381,  -695,   354,   376,  2244,
-    -695,   377,  -695,  -695,  -695,  -695
+     505,  -692,  -692,  -692,  -692,  -692,   108,  -692,  -692,  2618,
+    1668,   731,  -692,  -692,  1719,   552,  3473,  3473,  3473,  2425,
+      37,   261,    10,  -692,  1440,  1894,    71,   505,  -692,  -692,
+    -692,  -692,  -692,  2844,  -692,  -692,  -692,  -692,   143,   119,
+    -692,  -692,  -692,    65,  -692,   -23,  -692,  -692,    47,    84,
+     118,  -692,  -692,  -692,  -692,   140,  -692,   146,  -692,  -692,
+    -692,  -692,  -692,   831,  -692,    91,   100,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  2957,   -10,  -692,
+    -692,  -692,  -692,  3473,  3473,  3473,  2685,  -692,   104,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,   682,  -692,  -692,  -692,  -692,   124,   957,   957,
+      24,  -692,   682,  2505,  2618,  3473,  3473,  2120,   134,  -692,
+    -692,  -692,   158,  3473,   164,   164,    53,    53,   157,  -692,
+    -692,   178,   180,  -692,    91,   183,  -692,  -692,   190,  1894,
+     173,   175,  -692,   199,  -692,  2459,  1369,   -23,   173,  -692,
+    -692,   185,  -692,   192,  3473,  -692,   221,  -692,    67,  -692,
+    -692,   143,  -692,  -692,   197,   201,  2651,  2651,  3473,   181,
+    3473,  -692,  -692,    91,  -692,  -692,  -692,  -692,  -692,  -692,
+    2844,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   110,   957,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,   957,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,    48,  2505,  -692,  -692,  -692,  -692,  3070,  2505,   202,
+    3627,  -692,   205,   133,  -692,   137,  -692,  -692,  -692,  -692,
+     198,   204,   204,    25,    25,  3183,   206,  -692,   173,  1209,
+    -692,   181,   209,   207,   211,  -692,  2053,  -692,    91,   185,
+    -692,  -692,  -692,   241,  -692,  -692,   222,  -692,    28,  2768,
+    2844,   129,  -692,  -692,   144,   215,    78,  -692,  2844,  2166,
+    2844,  3473,  2844,  -692,  -692,    12,  -692,  -692,  -692,  -692,
+    -692,  2392,  -692,   223,  3473,   247,  -692,  3473,   250,  -692,
+    -692,  -692,  -692,   458,   262,  -692,  2948,  3473,  -692,  -692,
+    2505,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  2505,
+    2505,  -692,   253,  1397,  2844,  2844,  -692,  -692,  -692,  -692,
+      91,  -692,  1601,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  1083,  -692,   165,   535,  -692,  -692,  -692,  -692,
+    -692,  -692,  1488,  -692,  2392,  -692,  3603,  -692,  -692,  3473,
+    -692,  -692,  -692,    26,  2957,    91,   192,   185,  1635,   185,
+    2313,  2392,  3473,  -692,   246,   256,  3651,   248,   258,  -692,
+     259,   268,   254,   273,    51,  -692,   274,   276,  -692,  -692,
+    -692,  2826,  -692,   260,  2844,  3242,    91,   277,  -692,  -692,
+    -692,   279,  3627,   283,   275,  3554,  -692,   292,  2120,   285,
+    -692,  -692,  2731,  1331,  3473,   164,   164,  -692,  -692,  3473,
+      90,  -692,  -692,  -692,   287,  -692,  3651,  -692,  -692,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   286,
+     147,  -692,    10,  -692,   289,   731,   290,  3061,  -692,  -692,
+    2392,  2392,   291,  -692,  -692,  3183,  -692,    28,   293,  -692,
+    -692,   296,  3651,  -692,  1714,  -692,  2166,  -692,  2844,  -692,
+      10,  2844,  -692,  3473,  3355,  -692,  -692,  -692,  -692,  -692,
+    -692,   297,   300,  -692,  -692,  -692,  -692,  2505,  2505,   301,
+    -692,    33,   302,  -692,   285,   204,   204,   306,  -692,   390,
+     305,   390,   309,  2392,  -692,  3579,  -692,  -692,   185,   185,
+     127,   216,   196,   318,  3651,  -692,  -692,  -692,  -692,   319,
+    2279,  -692,   320,  2844,   182,  -692,   323,   247,   325,   957,
+    3414,  3627,  3675,   328,   324,   330,  2844,   329,   302,  2844,
+    2844,  -692,  -692,   390,  -692,    10,  1601,  -692,  2392,  -692,
+    -692,   318,  -692,  -692,  -692,  -692,   331,  2392,    10,  -692,
+    1827,   333,   337,  -692,   267,  -692,  -692,  -692,   338,   335,
+     347,   285,   339,  -692,   343,  -692,    27,  -692,  3699,    10,
+    3336,   341,   348,  -692,   342,  -692,  -692,   139,  -692,   350,
+     349,  -692,  2844,  -692,   361,   354,  2392,  1714,   355,  -692,
+    2166,  -692,  -692,   358,   366,   367,   285,   362,  1940,  3174,
+     246,  -692,  -692,  -692,   374,  2279,  -692,  -692,   375,   379,
+    -692,   380,   383,   384,  -692,  -692,  1714,  -692,   392,  -692,
+     390,   391,  2166,  -692,   394,  -692,  -692,  -692,  -692
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -574,131 +577,132 @@ static const short int yypact[] =
      means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     274,   402,   399,   403,   397,   398,   400,   394,   395,     0,
-     393,     0,   279,   278,     0,     0,     0,     0,   505,     0,
-       0,     0,   613,   280,     0,     0,     0,   275,   276,   282,
-     281,   283,   287,   516,   385,   387,   386,   392,   406,   417,
-     391,   284,   286,     0,   285,   422,   440,   442,   443,     0,
-       0,   452,   289,   288,   290,     0,   291,     0,   401,   396,
-      33,    34,   601,   567,    24,   516,   522,    39,    38,    37,
-      35,    36,    32,    31,    25,    29,    28,    26,    27,   575,
-     574,   572,   570,   571,   573,   569,   568,   576,    30,   599,
-     597,   596,   598,   595,   594,   453,     0,   518,   520,    40,
-      41,   393,     0,     0,     0,     0,   441,   428,   384,   293,
-     304,   301,   303,   305,   306,   317,   314,   315,   312,   318,
-     313,     0,   316,   307,   308,   309,     0,   334,   334,     0,
-     297,     0,     0,     0,   505,   505,     0,     0,   369,   374,
-     462,   373,     0,   511,   511,   388,   389,   390,   502,   355,
-     403,   394,   358,     0,     0,   354,   383,     0,     0,     0,
-       0,   615,     0,   614,   393,     0,   422,     0,     1,   277,
-     513,   463,     0,   517,   407,   411,   409,   413,   404,   418,
-     406,   405,   426,     0,     0,   454,   454,     0,     0,     0,
-     517,   523,   516,   465,   519,   521,   388,   389,   390,     0,
-     427,   320,   321,   322,   324,   325,   323,   319,   334,   299,
-     294,    67,    42,    43,    44,    45,    46,    47,    48,    49,
+     277,   405,   402,   406,   400,   401,   403,   397,   398,     0,
+     396,     0,   282,   281,     0,     0,     0,     0,   509,     0,
+       0,     0,   622,   283,     0,     0,     0,   278,   279,   285,
+     284,   286,   290,   520,   388,   390,   389,   395,   409,   420,
+     394,   287,   289,     0,   288,   425,   443,   445,   446,     0,
+       0,   455,   292,   291,   293,     0,   294,     0,   404,   399,
+      33,    34,   610,   571,    24,   520,   526,    39,    38,    37,
+      35,    36,    32,    31,    25,    29,    28,    26,    27,    40,
+     579,   578,   576,   574,   575,   577,   573,   572,   580,    30,
+     608,   606,   605,   607,   604,   603,   456,     0,   522,   524,
+      41,    42,   396,     0,     0,     0,     0,   444,   431,   387,
+     296,   307,   304,   306,   308,   309,   320,   317,   318,   315,
+     321,   316,     0,   319,   310,   311,   312,     0,   337,   337,
+       0,   300,     0,     0,     0,   509,   509,     0,     0,   372,
+     377,   465,   376,     0,   515,   515,   391,   392,   393,   506,
+     358,   406,   397,   361,     0,     0,   357,   386,     0,     0,
+       0,     0,   624,     0,   623,   396,     0,   425,     0,     1,
+     280,   517,   466,     0,   521,   410,   414,   412,   416,   407,
+     421,   409,   408,   429,     0,     0,   457,   457,     0,     0,
+       0,   521,   527,   520,   468,   523,   525,   391,   392,   393,
+       0,   430,   323,   324,   325,   327,   328,   326,   322,   337,
+     302,   297,    68,    43,    44,    45,    46,    47,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,   157,   158,    68,
+      60,    61,    62,    63,    64,    65,    66,    67,   158,   159,
       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,   107,   105,   106,   104,   102,   103,   108,
+      99,   100,   101,   102,   108,   106,   107,   105,   103,   104,
      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,   155,   152,   153,   154,   156,   336,   302,
-     335,   295,   310,   311,   296,   319,   298,   344,   345,     0,
-       0,    22,    23,    20,    21,     0,     0,   347,   300,   346,
-     453,   388,   504,   389,   503,   370,   366,   375,     0,     0,
-       0,     0,     0,     0,     0,   292,     0,     0,   432,     0,
-       0,     0,     0,   433,     0,   467,   516,   513,   412,   408,
-     414,   415,   410,   419,     0,   420,   455,     0,   516,     0,
-     456,   458,     0,   482,     0,   480,     0,   613,     0,     0,
-       0,   607,   608,     0,   544,   547,   546,   548,   549,     0,
-     550,     0,     0,   429,   430,     0,     0,   327,   337,   501,
-     500,     0,     0,   496,     0,     0,   342,   339,   349,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    13,
-      12,    14,    15,    16,    17,    18,    19,     0,     0,   367,
-       0,     0,     0,     0,   470,   469,   471,   468,   516,   464,
-     359,   434,   184,   159,   160,   161,   162,   163,   164,   165,
+     129,   130,   131,   132,   160,   133,   134,   135,   136,   137,
+     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
+     148,   149,   150,   151,   152,   156,   153,   154,   155,   157,
+     339,   305,   338,   298,   313,   314,   299,   322,   301,   347,
+     348,     0,     0,    22,    23,    20,    21,     0,     0,   350,
+     303,   349,   456,   391,   508,   392,   507,   373,   369,   378,
+       0,     0,     0,     0,     0,     0,     0,   295,     0,     0,
+     435,     0,     0,     0,     0,   436,     0,   470,   520,   517,
+     415,   411,   417,   418,   413,   422,     0,   423,   458,     0,
+     520,     0,   459,   461,     0,   485,     0,   483,     0,   622,
+       0,     0,     0,   616,   617,     0,   548,   551,   550,   552,
+     553,     0,   554,     0,     0,   432,   433,     0,     0,   330,
+     340,   505,   504,     0,     0,   500,     0,     0,   345,   342,
+     352,     2,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    13,    12,    14,    15,    16,    17,    18,    19,     0,
+       0,   370,     0,     0,     0,     0,   473,   472,   474,   471,
+     520,   467,   362,   437,   186,   161,   162,   163,   164,   165,
      166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   272,   273,
-     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     274,   275,   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,   222,   220,   221,   219,   217,   218,   223,   224,
+     215,   216,   217,   218,   224,   222,   223,   221,   219,   220,
      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,   270,   267,   268,   269,   271,   438,   439,     0,
-     436,     0,     0,   368,   421,   491,   490,   492,     0,   514,
-       0,   493,     0,   484,   494,     0,   466,   416,   424,     0,
-     461,     0,   459,   513,     0,   513,     0,     0,     0,   479,
-       0,     0,   590,     0,     0,   589,    41,     0,     0,     0,
-       0,   610,   600,     0,     0,   524,   545,     0,   451,     0,
-       0,   328,   516,     0,   497,   499,   338,     0,   351,     0,
-     350,     0,   340,     0,     0,   507,   378,   371,   379,     0,
-     380,   511,   511,   377,   376,     0,   362,   363,   364,   365,
-       0,   361,   360,   435,   437,   525,   537,   538,   539,   540,
-     536,   541,   542,   543,   535,     0,     0,   529,   613,   534,
-      24,     0,     0,     0,   488,   515,     0,     0,     0,   425,
-     423,   460,   446,     0,     0,   457,   444,     0,   483,   481,
-       0,   551,   613,   588,     0,   533,   613,     0,   609,     0,
-     587,   606,   450,   431,   329,   332,     0,   330,   498,   495,
-     343,   348,     0,     0,     0,   372,     0,   475,   472,   507,
-       0,     0,     0,   353,     0,     0,     0,   531,     0,   486,
-       0,   487,   448,   513,   513,   556,     0,    31,    30,   561,
-     562,   557,   559,   560,    40,     0,   591,   602,     0,     0,
-     611,   334,     0,   352,   341,     0,   508,     0,     0,     0,
-     475,   382,   381,   449,   526,     0,   530,   613,   359,   485,
-       0,   447,   445,     0,   558,   581,   567,   582,     0,     0,
-     613,   563,   613,     0,     0,   612,   326,   331,   333,     0,
-       0,     0,   507,   476,   473,     0,   527,     0,   532,   489,
-     613,     0,   577,     0,   604,   603,   592,   552,   512,     0,
-       0,   477,     0,   474,     0,     0,     0,     0,     0,   593,
-     613,     0,     0,   507,     0,   583,     0,   493,   579,   555,
-     553,   578,     0,   566,   605,     0,     0,   478,     0,     0,
-     584,   585,   564,     0,   554,     0,   509,     0,     0,   613,
-     580,     0,   528,   565,   586,   510
+     245,   246,   247,   248,   276,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   272,   269,   270,   271,   273,
+     441,   442,     0,   439,     0,     0,   371,   424,   496,   494,
+     493,   495,     0,   518,     0,   497,     0,   487,   498,     0,
+     469,   419,   427,     0,   464,     0,   462,   517,     0,   517,
+       0,     0,     0,   482,     0,     0,   599,     0,     0,   598,
+      42,     0,     0,     0,     0,   619,     0,     0,   593,   528,
+     549,     0,   454,     0,     0,   331,   520,     0,   501,   503,
+     341,     0,   354,     0,   353,     0,   343,     0,     0,   511,
+     381,   374,   382,     0,   383,   515,   515,   380,   379,     0,
+     496,   366,   367,   368,     0,   364,   363,   438,   440,   529,
+     541,   542,   543,   544,   540,   545,   546,   547,   539,     0,
+       0,   533,   622,   538,    24,     0,     0,     0,   491,   519,
+       0,     0,     0,   428,   426,   463,   449,     0,     0,   460,
+     447,     0,   486,   484,     0,   555,   622,   597,     0,   537,
+     622,     0,   618,     0,   594,   591,   615,   453,   434,   332,
+     335,     0,   333,   502,   499,   346,   351,     0,     0,     0,
+     375,     0,   478,   475,   511,     0,     0,     0,   356,     0,
+       0,     0,   535,     0,   489,     0,   490,   451,   517,   517,
+     496,     0,    31,    30,   561,   566,   562,   564,   565,    41,
+       0,   600,   611,     0,     0,   620,   610,   596,     0,   337,
+       0,   355,   344,     0,   512,     0,     0,     0,   478,   385,
+     384,   452,   530,     0,   534,   622,   362,   488,     0,   450,
+     448,     0,   563,   585,   571,   586,     0,     0,   622,   567,
+     622,     0,     0,   621,     0,   329,   334,   336,     0,     0,
+       0,   511,   479,   476,     0,   531,     0,   536,   492,   622,
+       0,   581,     0,   613,   612,   601,   556,     0,   516,     0,
+       0,   480,     0,   477,     0,     0,     0,     0,     0,   602,
+     622,   609,   592,     0,     0,     0,   511,     0,   587,     0,
+     497,   583,   559,   557,   582,     0,   570,   614,     0,     0,
+     481,     0,     0,   588,   589,   568,     0,   558,     0,   513,
+       0,     0,   622,   584,     0,   532,   569,   590,   514
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -695,  -323,  -121,    -4,    83,  -695,  -695,  -695,   387,  -695,
-    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,   286,
-    -695,  -695,  -695,  -122,  -695,  -307,  -695,  -695,  -695,  -695,
-    -695,  -360,  -695,  -695,   262,  -226,    23,  -219,  -158,    -9,
-    -695,  -695,  -695,   392,  -695,  -695,   255,  -695,  -695,  -695,
-    -695,   266,  -695,  -695,  -695,  -695,  -274,  -695,  -124,  -695,
-    -145,   412,    31,   -12,    26,  -695,  -695,   263,  -511,     8,
-     -33,  -695,  -695,    76,  -330,  -695,  -328,  -695,     4,  -695,
-    -163,  -352,  -695,  -117,  -695,    30,  -695,  -435,  -434,    82,
-    -684,  -125,  -370,   -56,    -1,  -695,   353,  -695,   431,  -695,
-    -283,  -632,  -694,  -695,    85,  -379,  -695,  -395,  -642,    64,
-    -278,  -695,  -695,  -645,  -695,  -695,  -695,  -695,  -695,  -695,
-    -695,  -658,    69,  -363,  -695,  -695,  -695,  -695,  -695,  -695,
-    -239,   -21,  -646
+    -692,  -331,  -122,    -4,    93,  -692,  -692,  -692,   401,  -692,
+    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   298,
+    -692,  -692,  -692,  -126,  -692,  -308,  -692,  -692,  -692,  -692,
+    -692,  -357,  -692,  -692,   269,  -220,    22,  -212,  -158,    -9,
+    -692,  -692,  -692,   399,  -692,  -692,   263,  -692,  -692,  -692,
+    -692,   280,  -692,  -692,  -692,  -692,  -624,  -692,  -124,  -692,
+    -140,   419,    32,     0,    45,  -692,  -692,   264,  -464,     8,
+     -33,  -692,  -692,    85,  -337,  -692,  -324,  -692,     4,  -692,
+    -157,  -349,  -692,  -117,  -692,    49,  -692,  -436,  -418,    83,
+    -691,  -125,  -370,   -59,    -1,  -692,   372,  -692,   435,  -692,
+    -281,  -634,  -674,  -692,   102,  -379,  -692,  -392,  -657,    77,
+    -275,  -692,  -692,  -666,  -692,  -692,  -692,  -692,  -692,  -692,
+    -692,  -692,  -692,  -665,  -395,  -369,  -692,  -692,  -692,  -692,
+    -692,  -692,  -236,   -21,  -658
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -1,   687,   590,   170,   328,   577,    26,    27,    28,    29,
-      30,   126,   127,   128,   129,   334,   130,   131,   132,   208,
-     209,   716,   717,   329,   330,   348,   639,   640,    31,   154,
-     155,   660,   661,    32,   137,   645,   646,   647,    33,    34,
-      35,    36,    37,    38,    39,    40,   178,   379,   382,   181,
-      41,   184,   599,    42,    43,   200,   413,    44,   578,   579,
-     580,    45,    46,    47,   140,    49,    50,   389,   390,    51,
-     591,    52,    53,   455,   456,   649,   769,   803,   142,   394,
-     395,   612,   593,   594,   633,   423,    55,   143,   144,   148,
-     727,   359,   375,   172,   415,    97,    98,    56,    57,   676,
-     677,   613,   678,   679,   403,   404,   405,   838,   839,   840,
-     751,   752,   753,    99,   828,   841,   788,   849,   850,   406,
-     407,   614,   615,   100,   793,   815,   408,   409,   410,   620,
-     621,   617,   163
+      -1,   691,   594,   171,   330,   580,    26,    27,    28,    29,
+      30,   127,   128,   129,   130,   336,   131,   132,   133,   209,
+     210,   721,   722,   331,   332,   350,   643,   644,    31,   155,
+     156,   664,   665,    32,   138,   649,   650,   651,    33,    34,
+      35,    36,    37,    38,    39,    40,   179,   381,   384,   182,
+      41,   185,   603,    42,    43,   201,   415,    44,   581,   582,
+     583,    45,    46,    47,   141,    49,    50,   391,   392,    51,
+     595,    52,    53,   457,   458,   653,   777,   812,   143,   396,
+     397,   616,   597,   598,   637,   425,    55,   144,   145,   149,
+     732,   361,   377,   173,   417,    98,    99,    56,    57,   680,
+     681,   617,   682,   683,   405,   406,   407,   851,   852,   853,
+     756,   757,   758,   100,   838,   854,   796,   862,   863,   408,
+     627,   768,   409,   618,   619,   101,   801,   824,   410,   411,
+     412,   624,   625,   621,   164
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -706,466 +710,496 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     171,   162,   108,   139,    54,    95,   331,   596,    96,   189,
-     156,   346,   145,   146,   147,   349,   651,   652,   107,   360,
-     361,   362,   592,   141,   626,   448,    48,   388,   388,   452,
-     453,    54,   173,   424,   616,   368,    48,   624,   138,   427,
-     774,   106,   777,   373,   756,   770,   737,    48,   705,    66,
-      48,    48,   159,    48,   755,   754,   167,   627,   750,   332,
-     380,    65,   157,   381,   190,   149,     1,     2,   150,     4,
-       5,     6,   151,     8,   152,   182,   419,   420,    66,   153,
-     766,   806,   421,    58,   101,    59,   417,   161,   824,  -452,
-     767,   199,   193,   695,   422,   695,   156,   168,   196,   197,
-     198,   448,   787,   185,   448,   689,   454,   183,   662,   186,
-     754,   451,   690,   791,   174,   175,   176,   207,   821,   177,
-     187,   638,   608,   194,   139,   609,   188,   335,   347,   350,
-     351,   353,    96,   191,   814,    66,   412,   210,   357,   708,
-     641,   642,   709,   356,   141,   737,   102,   103,   104,   847,
-    -452,   333,   363,   139,    62,   622,  -511,   358,   812,   355,
-     358,  -511,  -506,   862,  -443,  -462,   414,  -462,  -356,   377,
-    -388,  -506,   844,   141,   179,     4,     5,   851,   825,  -389,
-    -506,   842,   754,   393,    48,   411,   603,   604,   138,   366,
-      48,   190,  -357,   391,   391,   106,   364,   754,   605,   606,
-     854,   864,   626,   735,   736,   795,   630,   842,   754,   651,
-     652,   365,   785,   786,   651,   652,   352,   354,   367,   346,
-     369,   370,   376,   349,   374,   346,   378,   450,   384,   349,
-     385,   416,   428,   692,   449,   696,   683,   451,   684,   582,
-     583,   584,   461,   597,   460,   598,    89,    90,    91,    92,
-      93,    94,   607,   635,   628,   698,   396,   397,   398,   399,
-     400,   401,   402,     1,     2,     3,     4,     5,     6,     7,
-       8,   631,   630,   643,   700,   701,     9,   703,   705,   704,
-     702,   101,   706,   707,   710,   712,   724,   783,    11,   719,
-     720,   721,   789,   648,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,   722,   733,   726,   734,   346,   -24,   738,
-     742,   349,   743,   744,   761,   448,   762,   765,   448,   448,
-     595,   768,   773,   775,   778,   790,   346,   346,   792,   799,
-     349,   349,   602,   625,   740,   741,   347,   800,   801,   616,
-     804,   426,   347,   102,   103,   104,   105,   810,   749,   816,
-      22,   817,   818,   819,   820,   171,   822,   666,   823,   459,
-     667,   834,   827,   610,   668,   618,   669,   670,   671,   672,
-     673,   674,   829,   781,   782,   190,   830,   831,   156,   835,
-     832,   158,   843,   845,   846,   600,   779,   173,   396,   397,
-     398,   399,   400,   401,   402,   619,   848,   857,   853,   855,
-     771,   772,   655,   749,   856,   858,   861,   859,   629,   863,
-     865,   377,   632,   418,   169,   763,   764,   336,   808,   653,
-     654,   637,   665,   729,   347,   725,   662,   371,   809,   616,
-     682,   180,   372,   759,   664,   383,   166,   811,   457,   139,
-     448,   448,   805,   347,   347,   699,   388,    60,   388,   392,
-     195,   634,   160,   776,   581,   650,    61,   190,   860,   141,
-     611,    62,    63,   201,   202,   203,    64,   616,   784,   623,
-     760,     0,   616,     0,   836,   749,     0,   396,   397,   398,
-     399,   400,   401,   402,     0,     0,   648,     0,     0,     0,
-     749,   648,     0,     0,     0,     0,   616,     0,     0,     0,
-       0,   749,     1,     2,     3,     4,     5,     6,     7,     8,
-      67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
-     101,     0,     0,     0,   419,   420,   730,   731,     0,     0,
-       0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
-       0,     0,   422,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,     0,
-       0,     0,     0,     0,   204,     0,   205,   206,     0,     0,
-       0,     0,     0,     0,     0,     0,   718,     0,     0,     0,
-       0,     0,   102,   103,   104,     0,     0,     0,     0,     0,
-       0,   688,     0,     0,     0,     0,   193,   713,     0,     0,
-     691,   346,   346,     0,   393,   349,   349,     0,     0,     0,
-       0,     0,   391,     0,   391,   171,     1,     2,     3,     4,
-       5,     6,     7,     8,     0,     0,     0,   715,     0,     9,
-       0,   190,   139,     0,   101,     0,     0,   139,     0,   796,
-       0,    11,     0,     0,     0,     0,   357,   173,   650,   728,
-       0,   732,   141,   650,     0,     0,     0,   141,     0,     0,
+     172,   163,   109,   333,    54,    96,   190,   628,    97,   600,
+     157,   348,   146,   147,   148,   140,   351,   655,   108,   450,
+     362,   363,   364,   142,   454,   455,   630,   596,   390,   390,
+     620,    54,   174,   620,   426,   656,   370,   139,   759,    66,
+     429,   761,   107,   778,   375,    48,   760,   755,   742,   629,
+     334,   709,   693,   160,   162,    48,   456,   168,   774,   694,
+      65,   453,   631,   158,   191,   782,    48,   785,   775,    48,
+      48,   169,    48,   382,   421,   422,   383,    66,  -446,  -465,
+     423,  -465,   712,   419,  -515,   713,   795,   764,   360,  -515,
+     767,   834,   424,   194,   759,   450,   183,   157,   450,   197,
+     198,   199,   184,   799,   398,   399,   400,   401,   402,   815,
+     403,   404,   612,   666,   195,   613,   186,    58,   208,    59,
+     831,  -365,   642,  -365,  -365,   180,     4,     5,   337,   349,
+     352,   353,   355,    97,   414,   823,  -455,   140,   200,   359,
+      66,   645,   646,   335,   699,   142,   699,   175,   176,   177,
+     187,   742,   178,   365,   211,   860,    62,   841,  -496,   357,
+    -496,  -496,   607,   608,   821,   358,   140,   416,  -391,  -510,
+     379,   759,  -392,  -510,   142,   857,   188,   609,   610,   855,
+     740,   741,   189,   864,   395,   835,   413,   192,   139,   759,
+    -455,   368,   191,  -510,   393,   393,   875,   107,   867,   360,
+     759,  -359,   669,  -360,    48,   630,   366,   877,   855,   369,
+      48,   371,   655,   793,   794,   803,   634,   655,   354,   356,
+     348,   367,   372,   376,   378,   351,   348,   380,   418,   386,
+     656,   351,   387,   452,   430,   656,   451,   696,   586,   700,
+     453,   585,   587,   687,   463,   688,   462,   601,   602,    90,
+      91,    92,    93,    94,    95,   611,   632,   398,   399,   400,
+     401,   402,   702,   403,   404,     1,     2,     3,     4,     5,
+       6,     7,     8,   398,   399,   400,   401,   402,     9,   403,
+     404,   634,   635,   102,   639,   647,   704,   705,   706,   707,
+      11,   708,   709,   717,   710,   652,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,   711,   714,   715,   348,   727,
+     724,   450,   725,   351,   450,   450,   726,   729,   738,   599,
+     731,   739,   -24,   743,   747,   791,   748,   348,   348,   749,
+     769,   606,   351,   351,   770,   773,   776,   620,   349,   781,
+     783,   745,   746,   428,   349,   103,   104,   105,   106,   786,
+     797,   798,    22,   808,   800,   754,  -595,   172,   804,   809,
+     813,   461,   810,   819,   827,   614,   825,   622,   826,   626,
+     829,   828,   830,   832,   833,   837,   840,   191,   789,   790,
+     157,   839,   844,   845,   159,   847,   848,   604,   856,   174,
+     708,   858,   859,   670,   787,   861,   671,   623,   779,   780,
+     672,   659,   673,   674,   675,   676,   677,   678,   866,   868,
+     633,   754,   869,   379,   636,   870,   871,   874,   872,   771,
+     772,   657,   658,   641,   876,   420,   349,   878,   170,   817,
+     338,   620,   842,   734,   686,   373,   730,   666,   181,   818,
+     450,   450,   668,   167,   385,   349,   349,   374,   820,   459,
+     390,   394,   390,   140,   814,   703,   161,   654,   843,   191,
+     784,   142,     1,     2,     3,     4,     5,     6,     7,     8,
+     196,   620,   638,   584,   873,   615,   792,   765,     0,   620,
+     102,     0,     0,     0,   421,   422,     0,   849,   754,     0,
+     652,     0,     0,     0,     0,   652,     0,     0,     0,     0,
+       0,     0,   424,   620,     0,     0,   754,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,   754,     0,     0,
+       0,     0,     9,     0,     0,     0,     0,    10,     0,     0,
+     735,   736,     0,     0,    11,    12,    13,     0,   670,     0,
+       0,   671,   103,   104,   105,   672,    14,   673,   674,   675,
+     676,   677,   678,     0,     0,     0,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,     0,     0,     0,   679,   134,
+       0,     0,     0,     0,   102,     0,     0,   723,     0,     0,
+       0,    11,     0,     0,     0,     0,     0,     0,    15,    16,
+      17,    18,    19,    20,    21,   692,    22,     0,     0,     0,
+     194,   718,     0,     0,   695,   348,   348,     0,   395,     0,
+     351,   351,     0,     0,     0,     0,   393,     0,   393,   172,
+       0,    23,     0,     0,     0,     0,    24,     0,    25,     0,
+       0,   720,     0,     0,     0,   191,   135,   136,    18,   106,
+       0,     0,     0,   805,     0,     0,     0,     0,   140,     0,
+     359,   174,   654,   140,     0,   737,   142,   654,     0,     0,
+       0,   142,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   137,     0,   762,   157,     0,   416,     0,
+       0,   416,     0,     0,     0,    60,     0,     0,     0,   763,
+       0,   461,     0,     0,    61,     0,   604,     0,     0,    62,
+      63,   202,   203,   204,    64,     0,     0,     0,     0,   623,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   349,   349,     0,     0,     0,     0,     0,
+     802,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,   811,     0,     0,   657,   658,    67,    68,
+      69,    70,    71,   102,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   816,     0,   807,     0,     0,     0,
+      72,     0,    73,    74,    75,    76,    77,    78,     0,    79,
+       0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,     0,   846,
+       0,     0,     0,   205,   850,   206,   207,     0,     0,     0,
+       0,     0,     0,     0,     0,   103,   104,   105,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  -571,     0,   850,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,     0,  -571,     0,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
+    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,     0,  -571,
+    -571,     0,  -571,  -571,  -571,  -571,  -571,   212,     0,     0,
+     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,     0,   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,     0,   289,     0,
+     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,     0,     0,   324,     0,   325,   326,
+     327,   328,   329,   464,     0,     0,   465,   466,   467,   468,
+     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
+     479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
+     489,   490,   491,     0,   492,   493,   494,   495,   496,   369,
+     667,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,   510,   511,   512,   513,   514,   515,
+     516,   517,   518,   519,   520,   521,   522,   523,   524,   525,
+     526,   527,   528,   529,   530,   531,   532,   533,   534,   535,
+     536,   537,   538,     0,   539,     0,   540,   541,   542,   543,
+     544,   545,   546,   547,   548,   549,   550,   551,   552,   553,
+     554,   555,   556,   557,   558,   559,   560,   561,   562,   563,
+     564,   565,   566,   567,   568,   569,   570,   571,   572,   573,
+       0,     0,   574,     0,   575,   576,   577,   578,   579,   464,
+       0,     0,   465,   466,   467,   468,   469,   470,   471,   472,
+     473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
+     483,   484,   485,   486,   487,   488,   489,   490,   491,     0,
+     492,   493,   494,   495,   496,   369,     0,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+     510,   511,   512,   513,   514,   515,   516,   517,   518,   519,
+     520,   521,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,   537,   538,     0,
+     539,     0,   540,   541,   542,   543,   544,   545,   546,   547,
+     548,   549,   550,   551,   552,   553,   554,   555,   556,   557,
+     558,   559,   560,   561,   562,   563,   564,   565,   566,   567,
+     568,   569,   570,   571,   572,   573,     0,     0,   574,     0,
+     575,   576,   577,   578,   579,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,     0,     0,     9,     0,
+       0,     0,     0,   102,     0,     0,     0,     0,     0,     0,
+      11,     0,     0,     0,     0,     0,     0,     0,   733,     0,
        0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
-       8,   757,   156,     0,   414,     0,     9,     0,     0,     0,
-       0,    10,     0,     0,     0,   758,     0,   459,    11,    12,
-      13,     0,   600,     0,     0,     0,   134,   135,    18,   105,
-      14,     0,     0,     0,     0,   619,     0,     0,     0,     0,
-       1,     2,     3,     4,     5,     6,     7,     8,   347,   347,
-       0,     0,     0,   153,     0,   794,   109,     0,   101,     0,
-       0,     0,   644,     0,     0,   802,     0,     0,   653,   654,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
-      22,     0,     0,     0,     0,     0,   807,     0,   798,     0,
-       0,     0,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,    23,   122,   123,   124,   125,    24,
-       0,    25,     0,     0,     0,   711,     0,     0,     0,   833,
-     102,   103,   104,     0,   837,     0,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,   446,     0,     0,     0,     0,  -567,   686,
-     837,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,     0,  -567,
-       0,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
-    -567,  -567,  -567,  -567,     0,  -567,  -567,     0,  -567,  -567,
-    -567,  -567,  -567,   211,     0,     0,   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,     0,   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,     0,   288,     0,   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,     0,
-       0,   322,     0,   323,   324,   325,   326,   327,   462,     0,
-       0,   463,   464,   465,   466,   467,   468,   469,   470,   471,
-     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
-     482,   483,   484,   485,   486,   487,   488,   489,     0,   490,
-     491,   492,   493,   494,   367,   663,   495,   496,   497,   498,
-     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
-     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,     0,   537,
-       0,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-     547,   548,   549,   550,   551,   552,   553,   554,   555,   556,
-     557,   558,   559,   560,   561,   562,   563,   564,   565,   566,
-     567,   568,   569,   570,     0,     0,   571,     0,   572,   573,
-     574,   575,   576,   462,     0,     0,   463,   464,   465,   466,
-     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
-     477,   478,   479,   480,   481,   482,   483,   484,   485,   486,
-     487,   488,   489,     0,   490,   491,   492,   493,   494,   367,
-       0,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   509,   510,   511,   512,   513,
-     514,   515,   516,   517,   518,   519,   520,   521,   522,   523,
-     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
-     534,   535,   536,     0,   537,     0,   538,   539,   540,   541,
-     542,   543,   544,   545,   546,   547,   548,   549,   550,   551,
-     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
-     562,   563,   564,   565,   566,   567,   568,   569,   570,     0,
-       0,   571,     0,   572,   573,   574,   575,   576,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       0,   133,     0,     0,     0,     0,   101,     0,     0,     0,
-       0,     0,     0,    11,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,     0,     0,     0,     0,     9,     0,     0,
-       0,     0,   101,     0,     0,     0,     0,     0,     0,    11,
-       1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
-       0,     0,     0,     9,     0,     0,     0,     0,   101,     0,
-       0,     0,     0,     0,     0,    11,     0,     0,   134,   135,
-      18,   105,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,   134,   135,    18,   105,     9,     0,
-       0,     0,   666,   164,   136,   667,     0,     0,     0,   668,
-      11,   669,   670,   671,   672,   673,   674,     0,     0,     0,
-     134,   135,    18,   105,     0,     0,     0,     0,     0,     0,
-     136,     0,   675,    60,     1,     2,     3,     4,     5,     6,
-       7,     8,    61,     0,     0,     0,     0,    62,    63,     0,
-       0,     0,   680,   585,     0,   586,   644,   587,   339,    11,
-       0,     0,   588,     0,   165,   102,   103,   104,   105,     1,
-       2,     3,     4,     5,     6,     7,     8,   341,   342,    66,
-       0,     0,     9,     0,     0,     0,     0,   101,     0,     0,
-     343,   344,     0,     0,    11,     0,    67,    68,    69,    70,
-      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   102,   103,   104,   681,    72,     0,
-      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    60,     0,     0,     0,   102,
-     103,   104,   105,     0,    61,     0,     0,     0,     0,    62,
-      63,   656,   657,   658,    64,   585,     0,   586,   659,   587,
-     339,     0,     0,     0,   588,     0,     0,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,   341,
-     342,    66,   693,     0,     0,     0,     0,   101,     0,     0,
-       0,     0,   343,   344,    11,     0,     0,     0,    67,    68,
-      69,    70,    71,     1,     2,     3,     4,     5,     6,     7,
        8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
-      72,   101,    73,    74,    75,    76,    77,    78,    11,   694,
-       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    60,     0,   102,
-     103,   104,   387,     0,     0,     0,    61,     0,     0,     0,
-       0,    62,    63,   745,     0,     0,    64,   585,     0,   586,
-       0,   587,   339,     0,     0,     0,   588,     0,     0,     0,
-       0,     0,     0,   102,   103,   104,   105,     0,   161,     0,
-       0,   341,   342,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   343,   344,     0,     0,     0,     0,
-      67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    72,   746,   747,    74,    75,    76,    77,    78,
-       0,     0,     0,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,   748,    89,    90,    91,    92,    93,    94,    60,
-       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
-       0,     0,     0,    62,    63,   745,     0,     0,    64,   585,
-       0,   586,     0,   587,   339,     0,     0,     0,   588,     0,
-       0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
-       8,     0,     0,   341,   342,    66,   693,     0,     0,     0,
-       0,   101,     0,     0,     0,     0,   343,   344,    11,     0,
-       0,     0,    67,    68,    69,    70,    71,     0,     0,     0,
+       0,   102,     0,     0,     0,     0,     0,     0,    11,     0,
+       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
+       0,     0,     0,     0,     9,   135,   136,    18,   106,   102,
+       0,     0,     0,     0,     0,     0,    11,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,   648,   135,   136,    18,   106,     9,     0,     0,
+       0,     0,   165,     0,     0,     0,     0,     0,     0,    11,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   135,   136,    18,   106,     0,     0,     0,     0,     0,
+     137,    60,     1,     2,     3,     4,     5,     6,     7,     8,
+      61,     0,     0,     0,     0,    62,    63,   588,     0,     0,
+     684,   589,     0,   590,     0,   591,   341,    11,   648,     0,
+     592,     0,     0,   166,   103,   104,   105,   106,     0,     0,
+       0,     0,     0,     0,     0,   343,   344,    66,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   345,   346,
+       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    72,   746,   747,    74,    75,    76,
-      77,    78,     0,   697,     0,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,   748,    89,    90,    91,    92,    93,
-      94,    60,     0,   102,   103,   104,   387,     0,     0,     0,
-      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
-      64,   585,     0,   586,     0,   587,   339,     0,     0,     0,
-     588,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,   161,     0,     0,   341,   342,    66,     0,     0,
-       0,     0,   101,     0,     0,     0,     0,     0,   343,   344,
-       0,     0,   813,     0,    67,    68,    69,    70,    71,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
-       0,     0,     9,     0,     0,     0,    72,   101,    73,    74,
-      75,    76,    77,    78,    11,     0,     0,    79,    80,    81,
+       0,     0,   103,   104,   105,   685,    72,     0,    73,    74,
+      75,    76,    77,    78,     0,    79,     0,     0,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    60,   102,   103,   104,     0,     0,     0,
-       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
-       0,     0,    64,   585,  -613,   586,     0,   587,   339,     0,
-       0,     0,   588,     0,     0,     0,     0,     0,     0,   134,
-     135,    18,   105,     0,   161,     0,     0,   341,   342,    66,
+      92,    93,    94,    95,    60,     0,     0,     0,     0,     0,
+       0,     0,     0,    61,     0,     0,     0,     0,    62,    63,
+     660,   661,   662,    64,   589,     0,   590,   663,   591,   341,
+       0,     0,     0,   592,     0,     0,     0,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,   343,   344,
+      66,     0,   697,     0,     0,     0,     0,   102,     0,     0,
+       0,   345,   346,     0,    11,     0,     0,    67,    68,    69,
+      70,    71,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,     0,     0,     0,     0,     9,     0,     0,     0,    72,
+     102,    73,    74,    75,    76,    77,    78,    11,    79,   698,
+       0,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    60,     0,   103,
+     104,   105,   389,     0,     0,     0,    61,     0,     0,     0,
+       0,    62,    63,   750,     0,     0,    64,   589,     0,   590,
+       0,   591,   341,     0,     0,     0,   592,     0,     0,   110,
+       0,     0,   103,   104,   105,   106,     0,     0,   162,     0,
+       0,   343,   344,    66,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   345,   346,     0,     0,     0,     0,
+      67,    68,    69,    70,    71,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     0,   123,   124,
+     125,   126,    72,   751,   752,    74,    75,    76,    77,    78,
+       0,    79,     0,     0,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,   753,    90,    91,    92,    93,    94,    95,
+      60,     0,     0,     0,     0,     0,     0,     0,     0,    61,
+       0,     0,     0,     0,    62,    63,   588,     0,     0,    64,
+     589,     0,   590,     0,   591,   341,     0,     0,     0,   592,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   162,     0,     0,   343,   344,    66,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   345,   346,     0,
+       0,   822,     0,    67,    68,    69,    70,    71,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
+       0,     9,     0,     0,     0,    72,   102,    73,    74,    75,
+      76,    77,    78,    11,    79,     0,     0,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    60,     0,     0,     0,     0,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,   588,
+       0,     0,    64,   589,  -622,   590,     0,   591,   341,     0,
+       0,     0,   592,     0,     0,     0,     0,     0,   103,   104,
+     105,   106,     0,     0,   162,     0,     0,   343,   344,    66,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     343,   344,     0,     0,     0,     0,    67,    68,    69,    70,
+     345,   346,     0,     0,     0,     0,    67,    68,    69,    70,
       71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
-      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
+      73,    74,    75,    76,    77,    78,     0,    79,     0,     0,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    60,     0,     0,     0,     0,
-       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
-      63,     0,     0,     0,    64,   585,     0,   586,     0,   587,
-     339,     0,     0,     0,   588,     0,     0,     0,     0,     0,
-       0,   589,     0,     0,     0,     0,     0,     0,     0,   341,
-     342,    66,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   343,   344,     0,     0,     0,     0,    67,    68,
-      69,    70,    71,     1,     2,     3,     4,     5,     6,     7,
-       8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
-      72,   101,    73,    74,    75,    76,    77,    78,    11,     0,
-       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    60,     0,     0,
-       0,     0,     0,     0,     0,     0,    61,     0,     0,     0,
-       0,    62,    63,     0,     0,     0,    64,   585,     0,   586,
-       0,   587,   339,     0,     0,     0,   588,     0,     0,     0,
-       0,     0,     0,   102,   103,   104,   105,     0,   161,     0,
-       0,   341,   342,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   343,   344,     0,     0,     0,     0,
-      67,    68,    69,    70,    71,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,     0,     0,     0,     0,   386,     0,
-       0,     0,    72,   101,    73,    74,    75,    76,    77,    78,
-      11,     0,     0,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    60,
+      90,    91,    92,    93,    94,    95,    60,     0,     0,     0,
+       0,     0,     0,     0,     0,    61,     0,     0,     0,     0,
+      62,    63,   588,     0,     0,    64,   589,     0,   590,     0,
+     591,   341,     0,     0,     0,   592,     0,     0,     0,     0,
+       0,     0,   593,     0,     0,     0,     0,     0,     0,     0,
+     343,   344,    66,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   345,   346,     0,     0,     0,     0,    67,
+      68,    69,    70,    71,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,     0,     9,     0,     0,
+       0,    72,   102,    73,    74,    75,    76,    77,    78,    11,
+      79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    60,
        0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
-       0,     0,     0,    62,    63,     0,     0,     0,    64,   585,
-       0,   586,     0,   587,   339,     0,     0,     0,   588,     0,
-       0,     0,     0,     0,     0,   102,   103,   104,   387,     0,
-       0,     0,     0,   341,   342,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   343,   344,     0,     0,
-       0,     0,    67,    68,    69,    70,    71,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
-     601,     0,     0,     0,    72,   101,    73,    74,    75,    76,
-      77,    78,     0,     0,     0,    79,    80,    81,    82,    83,
+       0,     0,     0,    62,    63,   588,     0,     0,    64,   589,
+       0,   590,     0,   591,   341,     0,     0,     0,   592,     0,
+       0,     0,     0,     0,   135,   136,    18,   106,     0,     0,
+     162,     0,     0,   343,   344,    66,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   345,   346,     0,     0,
+       0,     0,    67,    68,    69,    70,    71,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    72,     0,    73,    74,    75,    76,
+      77,    78,     0,    79,     0,     0,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    60,     0,     0,     0,     0,     0,     0,     0,     0,
+      94,    95,    60,     0,     0,     0,     0,     0,     0,     0,
+       0,    61,     0,     0,     0,     0,    62,    63,   750,     0,
+       0,    64,   589,     0,   590,     0,   591,   341,     0,     0,
+       0,   592,     0,     0,     0,     0,     0,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,   343,   344,    66,     0,
+     697,     0,     0,     0,     0,   102,     0,     0,     0,   345,
+     346,     0,    11,     0,     0,    67,    68,    69,    70,    71,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    72,   751,   752,
+      74,    75,    76,    77,    78,     0,    79,   701,     0,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,   753,    90,
+      91,    92,    93,    94,    95,    60,     0,   103,   104,   105,
+     389,     0,     0,     0,    61,     0,     0,     0,     0,    62,
+      63,   588,     0,     0,    64,   589,     0,   590,     0,   591,
+     341,     0,     0,     0,   592,     0,     0,     0,   150,     1,
+       2,   151,     4,     5,     6,   152,     8,   153,     0,   343,
+     344,    66,   154,     0,     0,     0,     0,   102,     0,     0,
+       0,     0,   345,   346,     0,     0,     0,     0,    67,    68,
+      69,    70,    71,     1,     2,     3,     4,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
+      72,   102,    73,    74,    75,    76,    77,    78,    11,    79,
+       0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    60,   103,
+     104,   105,     0,     0,     0,     0,     0,    61,     0,     0,
+       0,     0,    62,    63,     0,     0,     0,    64,     0,     0,
+     339,     0,   340,   341,     0,     0,     0,   342,     0,     0,
+       0,     0,     0,   103,   104,   105,   106,     0,     0,     0,
+       0,     0,   343,   344,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   345,   346,     0,     0,     0,
+       0,    67,    68,    69,    70,    71,     0,     0,     0,     0,
+       0,     0,     0,   347,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    72,     0,    73,    74,    75,    76,    77,
+      78,     0,    79,     0,     0,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    60,     0,     0,     0,     0,     0,     0,     0,     0,
       61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
-      64,     0,     0,   337,     0,   338,   339,     0,     0,     0,
-     340,     0,     0,     0,     0,     0,     0,   102,   103,   104,
-       0,     0,     0,     0,     0,   341,   342,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   343,   344,
-       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
-       0,     0,     0,     0,     0,     0,   345,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
+      64,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      65,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,     0,    66,   388,     0,
+       0,     0,     0,   102,     0,     0,     0,     0,     0,     0,
+      11,     0,     0,     0,    67,    68,    69,    70,    71,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
+       0,     0,   154,     0,     0,     0,    72,   102,    73,    74,
+      75,    76,    77,    78,     0,    79,     0,     0,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    60,     0,     0,     0,     0,     0,     0,
-       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
-       0,     0,    64,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    65,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    67,    68,    69,    70,
-      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
-      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    60,     0,     0,     0,     0,
-       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
-      63,     0,     0,     0,    64,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -516,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    66,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,    68,
-      69,    70,    71,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      72,     0,    73,    74,    75,    76,    77,    78,     0,     0,
-       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    60,     0,     0,
-       0,     0,     0,     0,     0,     0,    61,     0,   636,     0,
-       0,    62,    63,     0,     0,     0,    64,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
-     442,   443,   444,   445,   446,     0,     0,     0,     0,     0,
-     447,     0,     0,    66,     0,     0,     0,     0,     0,     0,
+      92,    93,    94,    95,    60,   103,   104,   105,   389,     0,
+       0,     0,     0,    61,     0,     0,     0,     0,    62,    63,
+       0,     0,     0,    64,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  -520,     0,     0,     0,     0,     0,   103,
+     104,   105,     1,     2,     3,     4,     5,     6,     7,     8,
+      66,     0,     0,     0,     0,   605,     0,     0,     0,     0,
+     102,     0,     0,     0,     0,     0,     0,    67,    68,    69,
+      70,    71,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    72,
+       0,    73,    74,    75,    76,    77,    78,     0,    79,     0,
+       0,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    60,     0,     0,
+       0,     0,   103,   104,   105,     0,    61,   716,     0,     0,
+       0,    62,    63,     0,     0,     0,    64,     0,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,   446,   447,   448,     0,     0,     0,     0,
+       0,   690,     0,    66,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
-       0,     0,     0,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    60,
-       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
-       0,     0,     0,    62,    63,     0,     0,     0,    64,     0,
-     739,     0,     0,     0,     0,     0,     0,     0,   192,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,     0,     0,     0,
-       0,     0,   686,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    67,    68,    69,    70,    71,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    72,     0,    73,    74,    75,    76,
-      77,    78,     0,     0,     0,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    60,     0,     0,     0,     0,     0,     0,     0,     0,
-      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
-      64,     0,   852,     0,     0,     0,     0,     0,     0,     0,
-     425,   429,   430,   431,   432,   433,   434,   435,   436,   437,
-     438,   439,   440,   441,   442,   443,   444,   445,   446,     0,
-       0,     0,     0,     0,   686,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    60,     0,     0,     0,     0,     0,     0,
-       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
-       0,     0,    64,     0,     0,   826,     0,     0,     0,     0,
-       0,     0,   458,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
-     446,     0,     0,     0,     0,     0,   686,     0,     0,     0,
-       0,     0,    60,     0,     0,     0,    67,    68,    69,    70,
-      71,    61,     0,     0,     0,     0,    62,    63,     0,     0,
-       0,    64,     0,     0,     0,     0,     0,     0,    72,     0,
-      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,     0,     0,     0,     0,     0,
-       0,    60,     0,   714,     0,    67,    68,    69,    70,    71,
-      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
-      64,     0,     0,     0,     0,     0,     0,    72,     0,    73,
-      74,    75,    76,    77,    78,     0,     0,     0,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,     0,     0,     0,     0,     0,     0,
-      60,     0,   797,     0,    67,    68,    69,    70,    71,    61,
+       0,    79,     0,     0,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      60,     0,     0,     0,     0,     0,     0,     0,     0,    61,
        0,     0,     0,     0,    62,    63,     0,     0,     0,    64,
-       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
-      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,     0,     0,     0,     0,     0,     0,     0,
+       0,   640,     0,     0,     0,     0,     0,     0,     0,   193,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
+     441,   442,   443,   444,   445,   446,   447,   448,     0,     0,
+       0,     0,     0,   449,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    67,    68,    69,    70,    71,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    72,     0,    73,    74,    75,
-      76,    77,    78,     0,     0,     0,    79,    80,    81,    82,
+      76,    77,    78,     0,    79,     0,     0,    80,    81,    82,
       83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,   723,     0,     0,     0,     0,     0,     0,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,   780,     0,     0,
-       0,     0,   447,     0,   429,   430,   431,   432,   433,   434,
+      93,    94,    95,    60,     0,     0,     0,     0,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
+       0,     0,    64,     0,   744,     0,     0,     0,     0,     0,
+       0,     0,   427,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,     0,     0,     0,     0,     0,   690,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    67,    68,    69,    70,
+      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,    79,     0,     0,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    60,     0,     0,     0,
+       0,     0,     0,     0,     0,    61,     0,     0,     0,     0,
+      62,    63,     0,     0,     0,    64,     0,   865,     0,     0,
+       0,     0,     0,     0,     0,   460,   431,   432,   433,   434,
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,     0,     0,     0,   685,     0,   686,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,     0,     0,     0,     0,
-       0,   686,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
-       0,     0,     0,     0,     0,   447,   429,   430,   431,   432,
+     445,   446,   447,   448,     0,     0,     0,     0,     0,   690,
+       0,     0,     0,     0,     0,    60,     0,     0,     0,    67,
+      68,    69,    70,    71,    61,     0,     0,     0,     0,    62,
+      63,     0,     0,     0,    64,     0,     0,     0,     0,     0,
+       0,    72,     0,    73,    74,    75,    76,    77,    78,     0,
+      79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,     0,
+       0,     0,     0,     0,     0,     0,   719,     0,    67,    68,
+      69,    70,    71,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      72,     0,    73,    74,    75,    76,    77,    78,     0,    79,
+       0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    60,     0,
+       0,     0,     0,     0,     0,     0,     0,    61,     0,     0,
+     836,     0,   766,    63,     0,     0,     0,    64,   431,   432,
      433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,   446,     0,     0,     0,     0,     0,   686,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-     439,   440,   441,   442,   443,   444,   445,   446,     0,     0,
-       0,     0,     0,   447,   429,   430,   431,   432,   433,   434,
+     443,   444,   445,   446,   447,   448,     0,     0,     0,     0,
+       0,   690,     0,     0,    66,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    60,     0,     0,
+       0,    67,    68,    69,    70,    71,    61,     0,     0,     0,
+       0,    62,    63,     0,     0,     0,    64,     0,     0,     0,
+       0,     0,     0,    72,     0,    73,    74,    75,    76,    77,
+      78,     0,    79,     0,     0,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,     0,     0,     0,     0,     0,    60,     0,   806,     0,
+      67,    68,    69,    70,    71,    61,     0,     0,     0,     0,
+      62,    63,     0,     0,     0,    64,     0,     0,     0,     0,
+       0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
+       0,    79,     0,     0,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    67,
+      68,    69,    70,    71,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    72,     0,    73,    74,    75,    76,    77,    78,     0,
+      79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,   728,
+       0,     0,     0,     0,     0,     0,   431,   432,   433,   434,
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,     0,     0,     0,     0,     0,   686
+     445,   446,   447,   448,   788,     0,     0,     0,     0,   449,
+       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,     0,
+       0,     0,   689,     0,   690,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,     0,     0,     0,     0,     0,   690,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,     0,     0,     0,
+       0,     0,   449,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
+     448,     0,     0,     0,     0,     0,   690,   431,   432,   433,
+     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
+     444,   445,   446,   447,   448,     0,     0,     0,     0,     0,
+     449,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,     0,
+       0,     0,     0,     0,   690
 };
 
 static const short int yycheck[] =
 {
-      33,    22,    11,    15,     0,     9,   128,   377,     9,    65,
-      19,   132,    16,    17,    18,   132,   451,   451,    10,   144,
-     145,   146,   374,    15,   403,   348,     0,   185,   186,   359,
-     360,    27,    33,   340,   397,   159,    10,   400,    15,   346,
-     734,    10,   736,   167,   702,   729,   678,    21,    24,    49,
-      24,    25,    21,    27,   700,   700,    25,   409,   700,    26,
-       6,    32,    26,     9,    65,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    31,    26,    27,    49,    17,
-      25,   775,    32,     9,    22,    11,   208,    44,    64,    32,
-      35,    34,    96,   604,    44,   606,   105,     0,   102,   103,
-     104,   424,   747,    32,   427,    26,    31,   124,   460,    32,
-     755,    36,    33,   755,     4,     5,     6,   121,   802,     9,
-      36,   428,    34,   123,   136,    37,    36,   131,   132,   133,
-     134,   135,   133,    87,   792,    49,   192,    30,   142,    31,
-     447,   448,    34,    31,   136,   777,    84,    85,    86,   833,
-      32,   118,   153,   165,    17,    18,    31,    35,   790,   136,
-      35,    36,    36,   857,    31,    32,   199,    34,    23,   173,
-      35,    36,   830,   165,     6,     7,     8,   835,   810,    35,
-      36,   827,   827,   187,   158,   189,    33,    34,   165,   158,
-     164,   192,    23,   185,   186,   164,    23,   842,    33,    34,
-     842,   859,   581,    33,    34,    33,    34,   853,   853,   644,
-     644,    31,    17,    18,   649,   649,   134,   135,    36,   340,
-      36,    23,    32,   340,    38,   346,     6,    35,    32,   346,
-      31,   117,    32,   603,    31,   605,   588,    36,   590,    32,
-      31,    31,   366,     6,    40,    26,   109,   110,   111,   112,
-     113,   114,    40,    22,    33,   607,    92,    93,    94,    95,
-      96,    97,    98,     4,     5,     6,     7,     8,     9,    10,
-      11,    32,    34,    32,    40,    31,    17,    31,    24,    32,
-      40,    22,    40,    32,    31,    33,    25,   108,    29,    33,
-      33,    33,    32,   451,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,    34,    31,    35,    35,   428,    33,    33,
-      33,   428,    33,    33,    33,   638,    34,    34,   641,   642,
-     376,    34,    33,    35,    40,    32,   447,   448,    34,    25,
-     447,   448,   388,    37,   686,   687,   340,    35,    32,   702,
-      31,   345,   346,    84,    85,    86,    87,    32,   700,    33,
-      91,    31,    33,    35,    25,   388,    34,     3,    31,   363,
-       6,    24,    34,   396,    10,   398,    12,    13,    14,    15,
-      16,    17,    33,   743,   744,   376,    34,    32,   387,    32,
-      34,   122,    33,    25,    25,   386,   738,   388,    92,    93,
-      94,    95,    96,    97,    98,   399,    33,    35,    34,    34,
-     730,   731,   458,   755,    33,    33,    25,    34,   412,    33,
-      33,   415,   421,   330,    27,   722,   723,   131,   778,   452,
-     453,   425,    37,   649,   428,   644,   778,   165,   780,   792,
-     588,    39,   166,   707,   579,   180,    24,   789,   362,   451,
-     763,   764,   770,   447,   448,   608,   604,     3,   606,   186,
-      97,   421,    21,   736,   369,   451,    12,   458,   853,   451,
-     396,    17,    18,    19,    20,    21,    22,   830,   746,   400,
-     709,    -1,   835,    -1,   826,   827,    -1,    92,    93,    94,
-      95,    96,    97,    98,    -1,    -1,   644,    -1,    -1,    -1,
-     842,   649,    -1,    -1,    -1,    -1,   859,    -1,    -1,    -1,
-      -1,   853,     4,     5,     6,     7,     8,     9,    10,    11,
-      66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
-      22,    -1,    -1,    -1,    26,    27,   651,   652,    -1,    -1,
-      -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
-      -1,    -1,    44,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,    -1,
-      -1,    -1,    -1,    -1,   120,    -1,   122,   123,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   632,    -1,    -1,    -1,
-      -1,    -1,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
-      -1,   595,    -1,    -1,    -1,    -1,   600,   630,    -1,    -1,
-     601,   722,   723,    -1,   608,   722,   723,    -1,    -1,    -1,
-      -1,    -1,   604,    -1,   606,   648,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,   631,    -1,    17,
-      -1,   632,   644,    -1,    22,    -1,    -1,   649,    -1,   761,
-      -1,    29,    -1,    -1,    -1,    -1,   650,   648,   644,    37,
-      -1,   655,   644,   649,    -1,    -1,    -1,   649,    -1,    -1,
-      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
-      11,   704,   681,    -1,   707,    -1,    17,    -1,    -1,    -1,
-      -1,    22,    -1,    -1,    -1,   706,    -1,   691,    29,    30,
-      31,    -1,   693,    -1,    -1,    -1,    84,    85,    86,    87,
-      41,    -1,    -1,    -1,    -1,   709,    -1,    -1,    -1,    -1,
-       4,     5,     6,     7,     8,     9,    10,    11,   722,   723,
-      -1,    -1,    -1,    17,    -1,   758,    30,    -1,    22,    -1,
-      -1,    -1,   120,    -1,    -1,   768,    -1,    -1,   771,   772,
-      -1,    -1,    83,    84,    85,    86,    87,    88,    89,    -1,
-      91,    -1,    -1,    -1,    -1,    -1,   777,    -1,   762,    -1,
-      -1,    -1,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,   115,    79,    80,    81,    82,   120,
-      -1,   122,    -1,    -1,    -1,    31,    -1,    -1,    -1,   822,
-      84,    85,    86,    -1,   827,    -1,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    -1,    -1,    -1,    -1,     0,    65,
-     853,     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,    -1,    81,
-      -1,    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,    -1,   117,   118,    -1,   120,   121,
-     122,   123,   124,     0,    -1,    -1,     3,     4,     5,     6,
+      33,    22,    11,   129,     0,     9,    65,   402,     9,   379,
+      19,   133,    16,    17,    18,    15,   133,   453,    10,   350,
+     145,   146,   147,    15,   361,   362,   405,   376,   186,   187,
+     399,    27,    33,   402,   342,   453,   160,    15,   704,    49,
+     348,   706,    10,   734,   168,     0,   704,   704,   682,    37,
+      26,    24,    26,    21,    44,    10,    31,    25,    25,    33,
+      32,    36,   411,    26,    65,   739,    21,   741,    35,    24,
+      25,     0,    27,     6,    26,    27,     9,    49,    31,    32,
+      32,    34,    31,   209,    31,    34,   752,   711,    35,    36,
+     714,    64,    44,    97,   760,   426,    31,   106,   429,   103,
+     104,   105,   125,   760,    92,    93,    94,    95,    96,   783,
+      98,    99,    34,   462,   124,    37,    32,     9,   122,    11,
+     811,    31,   430,    33,    34,     6,     7,     8,   132,   133,
+     134,   135,   136,   134,   193,   800,    32,   137,    34,   143,
+      49,   449,   450,   119,   608,   137,   610,     4,     5,     6,
+      32,   785,     9,   154,    30,   846,    17,    18,    31,   137,
+      33,    34,    33,    34,   798,    31,   166,   200,    35,    36,
+     174,   837,    35,    36,   166,   840,    36,    33,    34,   837,
+      33,    34,    36,   848,   188,   819,   190,    87,   166,   855,
+      32,   159,   193,    36,   186,   187,   870,   165,   855,    35,
+     866,    23,    37,    23,   159,   584,    23,   872,   866,    36,
+     165,    36,   648,    17,    18,    33,    34,   653,   135,   136,
+     342,    31,    23,    38,    32,   342,   348,     6,   118,    32,
+     648,   348,    31,    35,    32,   653,    31,   607,    31,   609,
+      36,    32,    31,   592,   368,   594,    40,     6,    26,   110,
+     111,   112,   113,   114,   115,    40,    33,    92,    93,    94,
+      95,    96,   611,    98,    99,     4,     5,     6,     7,     8,
+       9,    10,    11,    92,    93,    94,    95,    96,    17,    98,
+      99,    34,    32,    22,    22,    32,    40,    31,    40,    31,
+      29,    32,    24,    33,    40,   453,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,    32,    32,    31,   430,    34,
+      33,   642,    33,   430,   645,   646,    33,    25,    31,   378,
+      35,    35,    33,    33,    33,   109,    33,   449,   450,    33,
+      33,   390,   449,   450,    34,    34,    34,   706,   342,    33,
+      35,   690,   691,   347,   348,    84,    85,    86,    87,    40,
+      32,    32,    91,    25,    34,   704,    33,   390,    33,    35,
+      31,   365,    32,    32,    97,   398,    33,   400,    31,   402,
+      35,    33,    25,    34,    31,    34,    34,   378,   748,   749,
+     389,    33,    32,    34,   123,    24,    32,   388,    33,   390,
+      32,    25,    25,     3,   743,    33,     6,   401,   735,   736,
+      10,   460,    12,    13,    14,    15,    16,    17,    34,    34,
+     414,   760,    33,   417,   423,    35,    33,    25,    34,   727,
+     728,   454,   455,   427,    33,   332,   430,    33,    27,   786,
+     132,   800,   827,   653,   592,   166,   648,   786,    39,   788,
+     771,   772,   582,    24,   181,   449,   450,   167,   797,   364,
+     608,   187,   610,   453,   778,   612,    21,   453,   827,   460,
+     741,   453,     4,     5,     6,     7,     8,     9,    10,    11,
+      98,   840,   423,   371,   866,   398,   751,   713,    -1,   848,
+      22,    -1,    -1,    -1,    26,    27,    -1,   836,   837,    -1,
+     648,    -1,    -1,    -1,    -1,   653,    -1,    -1,    -1,    -1,
+      -1,    -1,    44,   872,    -1,    -1,   855,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,   866,    -1,    -1,
+      -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+     655,   656,    -1,    -1,    29,    30,    31,    -1,     3,    -1,
+      -1,     6,    84,    85,    86,    10,    41,    12,    13,    14,
+      15,    16,    17,    -1,    -1,    -1,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    -1,    -1,    -1,    33,    17,
+      -1,    -1,    -1,    -1,    22,    -1,    -1,   636,    -1,    -1,
+      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,
+      85,    86,    87,    88,    89,   599,    91,    -1,    -1,    -1,
+     604,   634,    -1,    -1,   605,   727,   728,    -1,   612,    -1,
+     727,   728,    -1,    -1,    -1,    -1,   608,    -1,   610,   652,
+      -1,   116,    -1,    -1,    -1,    -1,   121,    -1,   123,    -1,
+      -1,   635,    -1,    -1,    -1,   636,    84,    85,    86,    87,
+      -1,    -1,    -1,   769,    -1,    -1,    -1,    -1,   648,    -1,
+     654,   652,   648,   653,    -1,   659,   648,   653,    -1,    -1,
+      -1,   653,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   121,    -1,   708,   685,    -1,   711,    -1,
+      -1,   714,    -1,    -1,    -1,     3,    -1,    -1,    -1,   710,
+      -1,   695,    -1,    -1,    12,    -1,   697,    -1,    -1,    17,
+      18,    19,    20,    21,    22,    -1,    -1,    -1,    -1,   713,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   727,   728,    -1,    -1,    -1,    -1,    -1,
+     763,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
+       9,    10,    11,   776,    -1,    -1,   779,   780,    66,    67,
+      68,    69,    70,    22,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   785,    -1,   770,    -1,    -1,    -1,
+      88,    -1,    90,    91,    92,    93,    94,    95,    -1,    97,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,    -1,   832,
+      -1,    -1,    -1,   121,   837,   123,   124,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    84,    85,    86,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     0,    -1,   866,     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,    -1,    81,    -1,    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,    -1,   118,
+     119,    -1,   121,   122,   123,   124,   125,     0,    -1,    -1,
+       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,    -1,    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,    -1,    81,    -1,
+      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,    -1,    -1,   119,    -1,   121,   122,
+     123,   124,   125,     0,    -1,    -1,     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,    -1,    31,    32,    33,    34,    35,    36,
@@ -1176,262 +1210,264 @@ static const short int yycheck[] =
       77,    78,    79,    -1,    81,    -1,    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,    -1,
-      -1,   118,    -1,   120,   121,   122,   123,   124,     0,    -1,
-      -1,     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,    -1,    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,    -1,    81,
-      -1,    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,    -1,    -1,   118,    -1,   120,   121,
-     122,   123,   124,     0,    -1,    -1,     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,    -1,    31,    32,    33,    34,    35,    36,
-      -1,    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,    -1,    81,    -1,    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,    -1,
-      -1,   118,    -1,   120,   121,   122,   123,   124,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,
-      -1,    -1,    -1,    29,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,
-      -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    84,    85,
-      86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    84,    85,    86,    87,    17,    -1,
-      -1,    -1,     3,    22,   120,     6,    -1,    -1,    -1,    10,
-      29,    12,    13,    14,    15,    16,    17,    -1,    -1,    -1,
-      84,    85,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
-     120,    -1,    33,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
-      -1,    -1,    22,    23,    -1,    25,   120,    27,    28,    29,
-      -1,    -1,    32,    -1,    83,    84,    85,    86,    87,     4,
-       5,     6,     7,     8,     9,    10,    11,    47,    48,    49,
-      -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
-      60,    61,    -1,    -1,    29,    -1,    66,    67,    68,    69,
-      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    84,    85,    86,    87,    88,    -1,
-      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    84,
-      85,    86,    87,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    19,    20,    21,    22,    23,    -1,    25,    26,    27,
-      28,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    47,
-      48,    49,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
-      -1,    -1,    60,    61,    29,    -1,    -1,    -1,    66,    67,
-      68,    69,    70,     4,     5,     6,     7,     8,     9,    10,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+      -1,    -1,   119,    -1,   121,   122,   123,   124,   125,     0,
+      -1,    -1,     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,    -1,
+      31,    32,    33,    34,    35,    36,    -1,    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,    -1,
+      81,    -1,    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,    -1,    -1,   119,    -1,
+     121,   122,   123,   124,   125,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
+      -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
+      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
       11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
-      88,    22,    90,    91,    92,    93,    94,    95,    29,    64,
-      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,     3,    -1,    84,
+      -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,
+      -1,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
+      -1,    -1,    -1,    -1,    17,    84,    85,    86,    87,    22,
+      -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
+      10,    11,   121,    84,    85,    86,    87,    17,    -1,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    84,    85,    86,    87,    -1,    -1,    -1,    -1,    -1,
+     121,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    -1,    -1,    -1,    -1,    17,    18,    19,    -1,    -1,
+      22,    23,    -1,    25,    -1,    27,    28,    29,   121,    -1,
+      32,    -1,    -1,    83,    84,    85,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    47,    48,    49,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,
+      -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    84,    85,    86,    87,    88,    -1,    90,    91,
+      92,    93,    94,    95,    -1,    97,    -1,    -1,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,
+      19,    20,    21,    22,    23,    -1,    25,    26,    27,    28,
+      -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    47,    48,
+      49,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      -1,    60,    61,    -1,    29,    -1,    -1,    66,    67,    68,
+      69,    70,     4,     5,     6,     7,     8,     9,    10,    11,
+      -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,    88,
+      22,    90,    91,    92,    93,    94,    95,    29,    97,    64,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,     3,    -1,    84,
       85,    86,    87,    -1,    -1,    -1,    12,    -1,    -1,    -1,
       -1,    17,    18,    19,    -1,    -1,    22,    23,    -1,    25,
-      -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    -1,    44,    -1,
+      -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,    30,
+      -1,    -1,    84,    85,    86,    87,    -1,    -1,    44,    -1,
       -1,    47,    48,    49,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,
-      66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      66,    67,    68,    69,    70,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    -1,    79,    80,
+      81,    82,    88,    89,    90,    91,    92,    93,    94,    95,
+      -1,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    18,    19,    -1,    -1,    22,
+      23,    -1,    25,    -1,    27,    28,    -1,    -1,    -1,    32,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    88,    89,    90,    91,    92,    93,    94,    95,
-      -1,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    19,    -1,    -1,    22,    23,
-      -1,    25,    -1,    27,    28,    -1,    -1,    -1,    32,    -1,
-      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    47,    48,    49,    17,    -1,    -1,    -1,
-      -1,    22,    -1,    -1,    -1,    -1,    60,    61,    29,    -1,
-      -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    90,    91,    92,    93,
-      94,    95,    -1,    64,    -1,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,     3,    -1,    84,    85,    86,    87,    -1,    -1,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      22,    23,    -1,    25,    -1,    27,    28,    -1,    -1,    -1,
-      32,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
-      10,    11,    44,    -1,    -1,    47,    48,    49,    -1,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    60,    61,
-      -1,    -1,    64,    -1,    66,    67,    68,    69,    70,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    17,    -1,    -1,    -1,    88,    22,    90,    91,
-      92,    93,    94,    95,    29,    -1,    -1,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,     3,    84,    85,    86,    -1,    -1,    -1,
-      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    44,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    -1,
+      -1,    64,    -1,    66,    67,    68,    69,    70,     4,     5,
+       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
+      -1,    17,    -1,    -1,    -1,    88,    22,    90,    91,    92,
+      93,    94,    95,    29,    97,    -1,    -1,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    19,
       -1,    -1,    22,    23,    24,    25,    -1,    27,    28,    -1,
-      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,    84,
-      85,    86,    87,    -1,    44,    -1,    -1,    47,    48,    49,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    84,    85,
+      86,    87,    -1,    -1,    44,    -1,    -1,    47,    48,    49,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       60,    61,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
       70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
-      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+      90,    91,    92,    93,    94,    95,    -1,    97,    -1,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    -1,    -1,    -1,    22,    23,    -1,    25,    -1,    27,
-      28,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    47,
-      48,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    60,    61,    -1,    -1,    -1,    -1,    66,    67,
-      68,    69,    70,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
-      88,    22,    90,    91,    92,    93,    94,    95,    29,    -1,
-      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    22,    23,    -1,    25,
-      -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    84,    85,    86,    87,    -1,    44,    -1,
-      -1,    47,    48,    49,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,
-      66,    67,    68,    69,    70,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
-      -1,    -1,    88,    22,    90,    91,    92,    93,    94,    95,
-      29,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
+     110,   111,   112,   113,   114,   115,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+      17,    18,    19,    -1,    -1,    22,    23,    -1,    25,    -1,
+      27,    28,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,
+      -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      47,    48,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,    66,
+      67,    68,    69,    70,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,
+      -1,    88,    22,    90,    91,    92,    93,    94,    95,    29,
+      97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,     3,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,    23,
+      -1,    -1,    -1,    17,    18,    19,    -1,    -1,    22,    23,
       -1,    25,    -1,    27,    28,    -1,    -1,    -1,    32,    -1,
-      -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,    -1,
-      -1,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    84,    85,    86,    87,    -1,    -1,
+      44,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    -1,    -1,
-      -1,    -1,    66,    67,    68,    69,    70,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      17,    -1,    -1,    -1,    88,    22,    90,    91,    92,    93,
-      94,    95,    -1,    -1,    -1,    99,   100,   101,   102,   103,
+      -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
+      94,    95,    -1,    97,    -1,    -1,   100,   101,   102,   103,
      104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     114,   115,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    19,    -1,
+      -1,    22,    23,    -1,    25,    -1,    27,    28,    -1,    -1,
+      -1,    32,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,
+       7,     8,     9,    10,    11,    -1,    47,    48,    49,    -1,
+      17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,    60,
+      61,    -1,    29,    -1,    -1,    66,    67,    68,    69,    70,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,
+      91,    92,    93,    94,    95,    -1,    97,    64,    -1,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,     3,    -1,    84,    85,    86,
+      87,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    19,    -1,    -1,    22,    23,    -1,    25,    -1,    27,
+      28,    -1,    -1,    -1,    32,    -1,    -1,    -1,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    -1,    47,
+      48,    49,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      -1,    -1,    60,    61,    -1,    -1,    -1,    -1,    66,    67,
+      68,    69,    70,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
+      88,    22,    90,    91,    92,    93,    94,    95,    29,    97,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,     3,    84,
+      85,    86,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
+      -1,    -1,    17,    18,    -1,    -1,    -1,    22,    -1,    -1,
+      25,    -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,
+      -1,    -1,    -1,    84,    85,    86,    87,    -1,    -1,    -1,
+      -1,    -1,    47,    48,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    -1,
+      -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    78,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,    94,
+      95,    -1,    97,    -1,    -1,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      22,    -1,    -1,    25,    -1,    27,    28,    -1,    -1,    -1,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,
-      -1,    -1,    -1,    -1,    -1,    47,    48,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,
-      -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    78,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
-      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
+      22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      32,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    49,    17,    -1,
+      -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,
+      29,    -1,    -1,    -1,    66,    67,    68,    69,    70,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    17,    -1,    -1,    -1,    88,    22,    90,    91,
+      92,    93,    94,    95,    -1,    97,    -1,    -1,   100,   101,
      102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
-      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
-      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      88,    -1,    90,    91,    92,    93,    94,    95,    -1,    -1,
-      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    33,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    22,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,
-      65,    -1,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,
+     112,   113,   114,   115,     3,    84,    85,    86,    87,    -1,
+      -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,
+      -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    84,
+      85,    86,     4,     5,     6,     7,     8,     9,    10,    11,
+      49,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,    -1,
+      22,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    68,
+      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
+      -1,    90,    91,    92,    93,    94,    95,    -1,    97,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,     3,    -1,    -1,
+      -1,    -1,    84,    85,    86,    -1,    12,    31,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    22,    -1,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,
+      -1,    65,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
-      -1,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,    -1,
-      33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    -1,    -1,    -1,
-      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
-      94,    95,    -1,    -1,    -1,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      22,    -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      32,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,
+      -1,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,
+      -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    -1,    -1,
+      -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
-      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
+      93,    94,    95,    -1,    97,    -1,    -1,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
-      -1,    -1,    22,    -1,    -1,    34,    -1,    -1,    -1,    -1,
+      -1,    -1,    22,    -1,    33,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    32,    42,    43,    44,    45,    46,    47,    48,
       49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
       59,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
-      -1,    -1,     3,    -1,    -1,    -1,    66,    67,    68,    69,
-      70,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
-      -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
-      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    97,    -1,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,    -1,    64,    -1,    66,    67,    68,    69,    70,
-      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      22,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,
-      91,    92,    93,    94,    95,    -1,    -1,    -1,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,    -1,    64,    -1,    66,    67,    68,    69,    70,    12,
-      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
-      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,
+     110,   111,   112,   113,   114,   115,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    22,    -1,    33,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    32,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,    65,
+      -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,    66,
+      67,    68,    69,    70,    12,    -1,    -1,    -1,    -1,    17,
+      18,    -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,
+      -1,    88,    -1,    90,    91,    92,    93,    94,    95,    -1,
+      97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    67,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
-      93,    94,    95,    -1,    -1,    -1,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,    35,    -1,    -1,    -1,    -1,    -1,    -1,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    35,    -1,    -1,
-      -1,    -1,    65,    -1,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    -1,    -1,    -1,    39,    -1,    65,    42,    43,
+      88,    -1,    90,    91,    92,    93,    94,    95,    -1,    97,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,     3,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
+      34,    -1,    17,    18,    -1,    -1,    -1,    22,    42,    43,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
       54,    55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,
-      -1,    65,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      -1,    -1,    -1,    -1,    -1,    65,    42,    43,    44,    45,
+      -1,    65,    -1,    -1,    49,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,
+      -1,    66,    67,    68,    69,    70,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    22,    -1,    -1,    -1,
+      -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,    94,
+      95,    -1,    97,    -1,    -1,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,    -1,    -1,    -1,    -1,    -1,     3,    -1,    64,    -1,
+      66,    67,    68,    69,    70,    12,    -1,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,
+      -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
+      -1,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
+      67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    88,    -1,    90,    91,    92,    93,    94,    95,    -1,
+      97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,    35,
+      -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,    45,
       46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,    65,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    -1,    -1,
-      -1,    -1,    -1,    65,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    -1,    -1,    -1,    -1,    -1,    65
+      56,    57,    58,    59,    35,    -1,    -1,    -1,    -1,    65,
+      -1,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    -1,
+      -1,    -1,    39,    -1,    65,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    -1,    -1,    -1,    -1,    -1,    65,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    -1,    -1,    -1,
+      -1,    -1,    65,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    -1,    -1,    -1,    -1,    -1,    65,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,
+      65,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    -1,
+      -1,    -1,    -1,    -1,    65
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1440,112 +1476,102 @@ static const unsigned short int yystos[] =
 {
        0,     4,     5,     6,     7,     8,     9,    10,    11,    17,
       22,    29,    30,    31,    41,    83,    84,    85,    86,    87,
-      88,    89,    91,   115,   120,   122,   133,   134,   135,   136,
-     137,   155,   160,   165,   166,   167,   168,   169,   170,   171,
-     172,   177,   180,   181,   184,   188,   189,   190,   191,   192,
-     193,   196,   198,   199,   205,   213,   224,   225,     9,    11,
+      88,    89,    91,   116,   121,   123,   134,   135,   136,   137,
+     138,   156,   161,   166,   167,   168,   169,   170,   171,   172,
+     173,   178,   181,   182,   185,   189,   190,   191,   192,   193,
+     194,   197,   199,   200,   206,   214,   225,   226,     9,    11,
        3,    12,    17,    18,    22,    32,    49,    66,    67,    68,
-      69,    70,    88,    90,    91,    92,    93,    94,    95,    99,
+      69,    70,    88,    90,    91,    92,    93,    94,    95,    97,
      100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   130,   221,   222,   223,   240,
-     250,    22,    84,    85,    86,    87,   189,   196,   166,    30,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    79,    80,    81,    82,   138,   139,   140,   141,
-     143,   144,   145,    17,    84,    85,   120,   161,   163,   190,
-     191,   196,   205,   214,   215,   130,   130,   130,   216,     3,
-       6,    10,    12,    17,   156,   157,   166,    26,   122,   189,
-     225,    44,   258,   259,    22,    83,   188,   189,     0,   135,
-     130,   197,   220,   221,     4,     5,     6,     9,   173,     6,
-     170,   176,    31,   124,   178,    32,    32,    36,    36,   220,
-     221,    87,    32,   130,   123,   223,   130,   130,   130,    34,
-     182,    19,    20,    21,   120,   122,   123,   130,   146,   147,
-      30,     0,     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,    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,    81,    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,   118,   120,   121,   122,   123,   124,   131,   150,
-     151,   150,    26,   118,   142,   130,   146,    25,    27,    28,
-      32,    47,    48,    60,    61,    78,   129,   130,   152,   210,
-     130,   130,   216,   130,   216,   163,    31,   130,    35,   218,
-     218,   218,   218,   221,    23,    31,   189,    36,   185,    36,
-      23,   161,   178,   185,    38,   219,    32,   130,     6,   174,
-       6,     9,   175,   173,    32,    31,    17,    87,   165,   194,
-     195,   196,   194,   130,   206,   207,    92,    93,    94,    95,
-      96,    97,    98,   231,   232,   233,   246,   247,   253,   254,
-     255,   130,   220,   183,   197,   221,   117,   150,   131,    26,
-      27,    32,    44,   212,   152,    32,   130,   152,    32,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    65,   128,    31,
-      35,    36,   201,   201,    31,   200,   201,   200,    32,   130,
-      40,   185,     0,     3,     4,     5,     6,     7,     8,     9,
+     110,   111,   112,   113,   114,   115,   131,   222,   223,   224,
+     241,   253,    22,    84,    85,    86,    87,   190,   197,   167,
+      30,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    79,    80,    81,    82,   139,   140,   141,
+     142,   144,   145,   146,    17,    84,    85,   121,   162,   164,
+     191,   192,   197,   206,   215,   216,   131,   131,   131,   217,
+       3,     6,    10,    12,    17,   157,   158,   167,    26,   123,
+     190,   226,    44,   261,   262,    22,    83,   189,   190,     0,
+     136,   131,   198,   221,   222,     4,     5,     6,     9,   174,
+       6,   171,   177,    31,   125,   179,    32,    32,    36,    36,
+     221,   222,    87,    32,   131,   124,   224,   131,   131,   131,
+      34,   183,    19,    20,    21,   121,   123,   124,   131,   147,
+     148,    30,     0,     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,
-      31,    32,    33,    34,    35,    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,    81,    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,   118,   120,   121,   122,   123,   124,   132,   185,   186,
-     187,   231,    32,    31,    31,    23,    25,    27,    32,    39,
-     129,   197,   208,   209,   210,   220,   219,     6,    26,   179,
-     221,    17,   220,    33,    34,    33,    34,    40,    34,    37,
-     197,   236,   208,   228,   248,   249,   250,   258,   197,   130,
-     256,   257,    18,   249,   250,    37,   232,   208,    33,   130,
-      34,    32,   166,   211,   212,    22,    33,   130,   152,   153,
-     154,   152,   152,    32,   120,   162,   163,   164,   165,   202,
-     205,   214,   215,   197,   197,   220,    19,    20,    21,    26,
-     158,   159,   208,    37,   187,    37,     3,     6,    10,    12,
-      13,    14,    15,    16,    17,    33,   226,   227,   229,   230,
-      22,    87,   165,   208,   208,    39,    65,   128,   130,    26,
-      33,   221,   219,    17,    64,   195,   219,    64,   208,   207,
-      40,    31,    40,    31,    32,    24,    40,    32,    31,    34,
-      31,    31,    33,   197,    64,   130,   148,   149,   220,    33,
-      33,    33,    34,    35,    25,   164,    35,   217,    37,   162,
-     218,   218,   130,    31,    35,    33,    34,   228,    33,    33,
-     208,   208,    33,    33,    33,    19,    89,    90,   108,   208,
-     235,   237,   238,   239,   240,   259,   248,   197,   258,   183,
-     257,    33,    34,   152,   152,    34,    25,    35,    34,   203,
-     217,   201,   201,    33,   229,    35,   227,   229,    40,   208,
-      35,   219,   219,   108,   237,    17,    18,   240,   243,    32,
-      32,   235,    34,   251,   197,    33,   150,    64,   130,    25,
-      35,    32,   197,   204,    31,   203,   229,   258,   158,   208,
-      32,   208,   228,    64,   248,   252,    33,    31,    33,    35,
-      25,   217,    34,    31,    64,   228,    34,    34,   241,    33,
-      34,    32,    34,   197,    24,    32,   208,   197,   234,   235,
-     236,   242,   259,    33,   248,    25,    25,   217,    33,   244,
-     245,   248,    33,    34,   235,    34,    33,    35,    33,    34,
-     234,    25,   229,    33,   248,    33
+      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,    81,
+      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,   119,   121,   122,   123,   124,   125,
+     132,   151,   152,   151,    26,   119,   143,   131,   147,    25,
+      27,    28,    32,    47,    48,    60,    61,    78,   130,   131,
+     153,   211,   131,   131,   217,   131,   217,   164,    31,   131,
+      35,   219,   219,   219,   219,   222,    23,    31,   190,    36,
+     186,    36,    23,   162,   179,   186,    38,   220,    32,   131,
+       6,   175,     6,     9,   176,   174,    32,    31,    17,    87,
+     166,   195,   196,   197,   195,   131,   207,   208,    92,    93,
+      94,    95,    96,    98,    99,   232,   233,   234,   247,   250,
+     256,   257,   258,   131,   221,   184,   198,   222,   118,   151,
+     132,    26,    27,    32,    44,   213,   153,    32,   131,   153,
+      32,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    65,
+     129,    31,    35,    36,   202,   202,    31,   201,   202,   201,
+      32,   131,    40,   186,     0,     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,    31,    32,    33,    34,    35,    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,    81,
+      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,   119,   121,   122,   123,   124,   125,
+     133,   186,   187,   188,   232,    32,    31,    31,    19,    23,
+      25,    27,    32,    39,   130,   198,   209,   210,   211,   221,
+     220,     6,    26,   180,   222,    17,   221,    33,    34,    33,
+      34,    40,    34,    37,   198,   237,   209,   229,   251,   252,
+     253,   261,   198,   131,   259,   260,   198,   248,   252,    37,
+     233,   209,    33,   131,    34,    32,   167,   212,   213,    22,
+      33,   131,   153,   154,   155,   153,   153,    32,   121,   163,
+     164,   165,   166,   203,   206,   215,   216,   198,   198,   221,
+      19,    20,    21,    26,   159,   160,   209,    37,   188,    37,
+       3,     6,    10,    12,    13,    14,    15,    16,    17,    33,
+     227,   228,   230,   231,    22,    87,   166,   209,   209,    39,
+      65,   129,   131,    26,    33,   222,   220,    17,    64,   196,
+     220,    64,   209,   208,    40,    31,    40,    31,    32,    24,
+      40,    32,    31,    34,    32,    31,    31,    33,   198,    64,
+     131,   149,   150,   221,    33,    33,    33,    34,    35,    25,
+     165,    35,   218,    37,   163,   219,   219,   131,    31,    35,
+      33,    34,   229,    33,    33,   209,   209,    33,    33,    33,
+      19,    89,    90,   109,   209,   236,   238,   239,   240,   241,
+     262,   251,   198,   261,   184,   260,    17,   184,   249,    33,
+      34,   153,   153,    34,    25,    35,    34,   204,   218,   202,
+     202,    33,   230,    35,   228,   230,    40,   209,    35,   220,
+     220,   109,   238,    17,    18,   241,   244,    32,    32,   236,
+      34,   254,   198,    33,    33,   151,    64,   131,    25,    35,
+      32,   198,   205,    31,   204,   230,   261,   159,   209,    32,
+     209,   229,    64,   251,   255,    33,    31,    97,    33,    35,
+      25,   218,    34,    31,    64,   229,    34,    34,   242,    33,
+      34,    18,   252,   253,    32,    34,   198,    24,    32,   209,
+     198,   235,   236,   237,   243,   262,    33,   251,    25,    25,
+     218,    33,   245,   246,   251,    33,    34,   236,    34,    33,
+      35,    33,    34,   235,    25,   230,    33,   251,    33
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned short int yyr1[] =
 {
-       0,   127,   128,   128,   128,   128,   128,   128,   128,   128,
-     128,   128,   128,   128,   128,   128,   128,   128,   128,   128,
-     129,   129,   129,   129,   130,   130,   130,   130,   130,   130,
-     130,   130,   130,   130,   130,   130,   130,   130,   130,   130,
-     130,   130,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+       0,   128,   129,   129,   129,   129,   129,   129,   129,   129,
+     129,   129,   129,   129,   129,   129,   129,   129,   129,   129,
+     130,   130,   130,   130,   131,   131,   131,   131,   131,   131,
      131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
-     131,   131,   131,   131,   131,   131,   131,   131,   131,   132,
+     131,   131,   131,   132,   132,   132,   132,   132,   132,   132,
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
@@ -1557,41 +1583,53 @@ static const unsigned short int yyr1[] =
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
      132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
-     132,   132,   132,   132,   133,   133,   134,   134,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   136,   137,   137,   138,   138,   138,   138,   138,
-     138,   138,   138,   139,   139,   140,   140,   141,   141,   141,
-     142,   142,   143,   143,   144,   144,   144,   145,   145,   146,
-     146,   146,   146,   146,   146,   146,   147,   147,   148,   148,
-     148,   148,   149,   149,   150,   150,   151,   151,   152,   152,
-     152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-     153,   154,   154,   155,   156,   157,   157,   157,   157,   158,
-     158,   158,   159,   159,   159,   159,   160,   160,   160,   161,
-     161,   162,   162,   163,   163,   163,   163,   163,   164,   164,
-     164,   164,   164,   165,   165,   165,   166,   166,   167,   167,
-     167,   168,   168,   168,   169,   169,   169,   170,   170,   171,
-     171,   171,   172,   172,   172,   172,   173,   173,   173,   173,
-     173,   174,   174,   175,   175,   175,   175,   176,   176,   176,
-     177,   177,   178,   178,   179,   179,   180,   181,   182,   182,
-     183,   183,   184,   184,   184,   185,   186,   186,   187,   187,
-     188,   188,   189,   189,   190,   190,   191,   191,   192,   192,
-     192,   192,   193,   193,   194,   194,   194,   194,   195,   195,
-     195,   195,   196,   196,   196,   196,   197,   197,   198,   199,
-     200,   200,   201,   202,   202,   203,   203,   204,   204,   205,
-     206,   206,   207,   207,   208,   208,   208,   208,   208,   208,
-     209,   209,   209,   209,   209,   210,   210,   211,   211,   212,
-     212,   212,   213,   214,   215,   216,   216,   217,   217,   217,
-     217,   218,   218,   219,   219,   219,   220,   220,   221,   221,
-     222,   222,   223,   223,   224,   224,   225,   225,   225,   226,
-     226,   227,   227,   228,   229,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   231,   231,   232,   232,   232,   232,
-     232,   233,   233,   234,   234,   234,   235,   235,   235,   235,
-     235,   235,   236,   236,   237,   238,   239,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   241,   241,   242,
-     242,   243,   243,   244,   244,   245,   245,   246,   247,   248,
-     248,   248,   249,   249,   250,   250,   250,   250,   250,   250,
-     250,   250,   251,   251,   252,   252,   253,   254,   254,   255,
-     256,   256,   257,   258,   258,   259
+     132,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   134,   134,   135,
+     135,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   137,   138,   138,   139,   139,
+     139,   139,   139,   139,   139,   139,   140,   140,   141,   141,
+     142,   142,   142,   143,   143,   144,   144,   145,   145,   145,
+     146,   146,   147,   147,   147,   147,   147,   147,   147,   148,
+     148,   149,   149,   149,   149,   150,   150,   151,   151,   152,
+     152,   153,   153,   153,   153,   153,   153,   153,   153,   153,
+     153,   153,   154,   154,   155,   155,   156,   157,   158,   158,
+     158,   158,   159,   159,   159,   160,   160,   160,   160,   161,
+     161,   161,   162,   162,   163,   163,   164,   164,   164,   164,
+     164,   165,   165,   165,   165,   165,   166,   166,   166,   167,
+     167,   168,   168,   168,   169,   169,   169,   170,   170,   170,
+     171,   171,   172,   172,   172,   173,   173,   173,   173,   174,
+     174,   174,   174,   174,   175,   175,   176,   176,   176,   176,
+     177,   177,   177,   178,   178,   179,   179,   180,   180,   181,
+     182,   183,   183,   184,   184,   185,   185,   185,   186,   187,
+     187,   188,   188,   189,   189,   190,   190,   191,   191,   192,
+     192,   193,   193,   193,   193,   194,   194,   195,   195,   195,
+     195,   196,   196,   196,   196,   197,   197,   197,   197,   198,
+     198,   199,   200,   201,   201,   202,   203,   203,   204,   204,
+     205,   205,   206,   207,   207,   208,   208,   209,   209,   209,
+     209,   209,   209,   210,   210,   210,   210,   210,   210,   211,
+     211,   212,   212,   213,   213,   213,   214,   215,   216,   217,
+     217,   218,   218,   218,   218,   219,   219,   220,   220,   220,
+     221,   221,   222,   222,   223,   223,   224,   224,   225,   225,
+     226,   226,   226,   227,   227,   228,   228,   229,   230,   231,
+     231,   231,   231,   231,   231,   231,   231,   231,   232,   232,
+     233,   233,   233,   233,   233,   234,   234,   235,   235,   235,
+     236,   236,   236,   236,   236,   236,   237,   237,   238,   239,
+     240,   241,   241,   241,   241,   241,   241,   241,   241,   241,
+     241,   242,   242,   243,   243,   244,   244,   245,   245,   246,
+     246,   247,   248,   248,   249,   249,   249,   250,   251,   251,
+     251,   252,   252,   253,   253,   253,   253,   253,   253,   253,
+     253,   254,   254,   255,   255,   256,   257,   257,   258,   259,
+     259,   260,   261,   261,   262
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1624,41 +1662,42 @@ static const unsigned char yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     1,     1,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     2,     3,     2,     2,     1,     2,     2,
-       2,     1,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     1,     1,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     2,     3,     2,     2,
+       1,     2,     2,     2,     1,     2,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     6,     2,     0,     1,
-       1,     3,     1,     3,     0,     1,     1,     2,     3,     2,
-       3,     5,     2,     4,     1,     1,     1,     1,     4,     0,
-       1,     1,     3,     6,     1,     1,     1,     1,     1,     0,
-       1,     1,     1,     1,     1,     1,     3,     4,     4,     1,
-       2,     1,     2,     1,     1,     2,     4,     4,     1,     1,
-       1,     3,     3,     2,     2,     1,     1,     1,     2,     2,
-       2,     1,     1,     1,     1,     1,     2,     1,     1,     1,
-       1,     2,     1,     1,     2,     2,     0,     1,     2,     1,
-       2,     0,     1,     0,     1,     1,     2,     0,     1,     2,
-       3,     4,     0,     4,     1,     2,     2,     3,     0,     2,
-       1,     3,     3,     3,     4,     3,     1,     2,     1,     1,
-       1,     2,     1,     1,     5,     7,     5,     7,     6,     7,
-       6,     5,     1,     2,     0,     1,     1,     3,     1,     2,
-       3,     2,     1,     2,     4,     3,     3,     2,     4,     4,
-       1,     1,     3,     4,     5,     0,     2,     2,     4,     4,
-       1,     3,     1,     3,     1,     4,     3,     3,     2,     5,
-       1,     1,     1,     1,     1,     4,     2,     1,     2,     2,
-       1,     1,     2,     2,     2,     0,     1,     0,     2,     7,
-       9,     0,     7,     0,     2,     3,     0,     1,     1,     2,
-       1,     2,     1,     2,     4,     5,     7,     8,    13,     1,
-       3,     2,     4,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
-       1,     3,     6,     1,     2,     1,     1,     1,     2,     1,
-       1,     1,     3,     4,     6,     8,     5,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     2,     1,
-       3,     1,     1,     0,     1,     1,     3,     3,     3,     1,
-       1,     3,     5,     6,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     1,     3,     3,     1,     1,     3,
-       1,     3,     4,     0,     1,     1
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     6,
+       2,     0,     1,     1,     3,     1,     3,     0,     1,     1,
+       2,     3,     2,     3,     5,     2,     4,     1,     1,     1,
+       1,     4,     0,     1,     1,     3,     6,     1,     1,     1,
+       1,     1,     0,     1,     1,     1,     1,     1,     1,     3,
+       4,     4,     1,     2,     1,     2,     1,     1,     2,     4,
+       4,     1,     1,     1,     3,     3,     2,     2,     1,     1,
+       1,     2,     2,     2,     1,     1,     1,     1,     1,     2,
+       1,     1,     1,     1,     2,     1,     1,     2,     2,     0,
+       1,     2,     1,     2,     0,     1,     0,     1,     1,     2,
+       0,     1,     2,     3,     4,     0,     4,     1,     2,     2,
+       3,     0,     2,     1,     3,     3,     3,     4,     3,     1,
+       2,     1,     1,     1,     2,     1,     1,     5,     7,     5,
+       7,     6,     7,     6,     5,     1,     2,     0,     1,     1,
+       3,     1,     2,     3,     2,     1,     2,     4,     3,     3,
+       2,     4,     4,     1,     1,     3,     4,     5,     0,     2,
+       2,     4,     4,     1,     3,     1,     3,     1,     4,     3,
+       3,     2,     5,     1,     1,     1,     1,     1,     1,     4,
+       2,     1,     2,     2,     1,     1,     2,     2,     2,     0,
+       1,     0,     2,     7,     9,     0,     7,     0,     2,     3,
+       0,     1,     1,     2,     1,     2,     1,     2,     4,     5,
+       7,     8,    13,     1,     3,     2,     4,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       1,     1,     1,     1,     1,     3,     6,     1,     2,     1,
+       1,     1,     1,     2,     1,     1,     3,     4,     6,     8,
+       5,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     2,     1,     3,     1,     1,     0,     1,     1,
+       3,     3,     6,     1,     0,     1,     1,     3,     1,     1,
+       3,     5,     6,     1,     1,     1,     1,     1,     1,     1,
+       1,     0,     2,     1,     3,     3,     1,     1,     3,     1,
+       3,     4,     0,     1,     1
 };
 
 
@@ -1701,6 +1740,7 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     1,     2,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1720,13 +1760,13 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       2,     1,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1793,7 +1833,8 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1861,7 +1902,8 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -1877,17 +1919,20 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     5,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   257,     0,   259,   261,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   265,     0,
+     267,   269,     0,     0,     0,     0,     0,     0,   251,     0,
+       0,     0,   253,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     5,     0,     0,     0,     0,     0,
-     249,     0,     0,     0,     0,     0,     0,     0,     0,   251,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1896,11 +1941,13 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   255,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   263,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   253,     0,
+       0,     0,     0,     0,     0,     0,   271,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1948,23 +1995,22 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     7,     0,     0,     9,    11,    13,    15,    17,    19,
+      21,    23,    25,    27,    29,    31,    33,    35,    37,    39,
+      41,    43,    45,    47,    49,    51,    53,    55,    57,    59,
+      61,    63,    65,    67,    69,    71,    73,    75,    77,    79,
+      81,    83,    85,    87,    89,    91,    93,    95,    97,    99,
+     101,   103,   105,   107,   109,   111,   113,   115,   117,   119,
+     121,   123,   125,   127,   129,   131,   133,   135,   137,   139,
+     141,   143,   145,   147,   149,   151,   153,   155,   157,   159,
+     161,     0,   163,     0,   165,   167,   169,   171,   173,   175,
+     177,   179,   181,   183,   185,   187,   189,   191,   193,   195,
+     197,   199,   201,   203,   205,   207,   209,   211,   213,   215,
+     217,   219,   221,   223,   225,   227,   229,   231,     0,   233,
+     235,     0,   237,   239,   241,   243,   245,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     7,     0,
-       0,     9,    11,    13,    15,    17,    19,    21,    23,    25,
-      27,    29,    31,    33,    35,    37,    39,    41,    43,    45,
-      47,    49,    51,    53,    55,    57,    59,    61,    63,    65,
-      67,    69,    71,    73,    75,    77,    79,    81,    83,    85,
-      87,    89,    91,    93,    95,    97,    99,   101,   103,   105,
-     107,   109,   111,   113,   115,   117,   119,   121,   123,   125,
-     127,   129,   131,   133,   135,   137,   139,   141,   143,   145,
-     147,   149,   151,   153,   155,   157,   159,   161,     0,   163,
-       0,   165,   167,   169,   171,   173,   175,   177,   179,   181,
-     183,   185,   187,   189,   191,   193,   195,   197,   199,   201,
-     203,   205,   207,   209,   211,   213,   215,   217,   219,   221,
-     223,   225,   227,   229,     0,   231,   233,     0,   235,   237,
-     239,   241,   243,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2021,7 +2067,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     1,     0,     0,     0,     0,     3,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2035,6 +2080,8 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     0,     0,     0,     0,
+       3,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2091,8 +2138,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   245,     0,     0,     0,
-       0,   247,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2114,6 +2159,8 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   247,     0,     0,     0,
+       0,   249,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2228,41 +2275,54 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   255,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   257
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     273,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   275
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   393,     0,   393,     0,   462,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
-       0,   600,     0,   600,     0,   393,     0,   393,     0,   506,
-       0,   506,     0,   393,     0,   341,     0,   489,     0
+       0,   396,     0,   396,     0,   465,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
+       0,   609,     0,   609,     0,   609,     0,   396,     0,   396,
+       0,   510,     0,   510,     0,    42,     0,   496,     0,   496,
+       0,   496,     0,   396,     0,   560,     0,   560,     0,   560,
+       0,   610,     0,   344,     0,   492,     0
 };
 
 /* Error token number */
@@ -2691,19 +2751,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;
   switch (yyn)
     {
-        case 281:
-#line 395 "src/parser_proc_grammar.y" /* glr.c:816  */
+        case 284:
+#line 398 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                psi_cpp_exp_exec((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), P->preproc, PSI_DATA(P));
                psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 2703 "src/parser_proc.c" /* glr.c:816  */
+#line 2763 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 282:
-#line 401 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 285:
+#line 404 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (P->file.ln) {
                P->error(PSI_DATA(P), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), PSI_WARNING,
@@ -2712,91 +2772,91 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                P->file.ln = strndup((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size);
        }
 }
-#line 2716 "src/parser_proc.c" /* glr.c:816  */
+#line 2776 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 283:
-#line 409 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 286:
+#line 412 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_const(P, (*(struct psi_const **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2724 "src/parser_proc.c" /* glr.c:816  */
+#line 2784 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 284:
-#line 412 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 287:
+#line 415 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_decl(P, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2732 "src/parser_proc.c" /* glr.c:816  */
+#line 2792 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 287:
-#line 417 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 290:
+#line 420 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_typedef(P, (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2740 "src/parser_proc.c" /* glr.c:816  */
+#line 2800 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 288:
-#line 420 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 291:
+#line 423 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_struct(P, (*(struct psi_decl_struct **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2748 "src/parser_proc.c" /* glr.c:816  */
+#line 2808 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 289:
-#line 423 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 292:
+#line 426 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_union(P, (*(struct psi_decl_union **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2756 "src/parser_proc.c" /* glr.c:816  */
+#line 2816 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 290:
-#line 426 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 293:
+#line 429 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2764 "src/parser_proc.c" /* glr.c:816  */
+#line 2824 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 291:
-#line 429 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 294:
+#line 432 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_impl(P, (*(struct psi_impl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2772 "src/parser_proc.c" /* glr.c:816  */
+#line 2832 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 292:
-#line 435 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 295:
+#line 438 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2780 "src/parser_proc.c" /* glr.c:816  */
+#line 2840 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 293:
-#line 441 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 296:
+#line 444 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2788 "src/parser_proc.c" /* glr.c:816  */
+#line 2848 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 294:
-#line 444 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 297:
+#line 447 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = (*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2796 "src/parser_proc.c" /* glr.c:816  */
+#line 2856 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 295:
-#line 450 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 298:
+#line 453 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                struct psi_token *msg = NULL;
@@ -2820,201 +2880,201 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2824 "src/parser_proc.c" /* glr.c:816  */
+#line 2884 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 296:
-#line 473 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 299:
+#line 476 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2833 "src/parser_proc.c" /* glr.c:816  */
+#line 2893 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 297:
-#line 477 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 300:
+#line 480 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2842 "src/parser_proc.c" /* glr.c:816  */
+#line 2902 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 298:
-#line 481 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 301:
+#line 484 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2852 "src/parser_proc.c" /* glr.c:816  */
+#line 2912 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 299:
-#line 486 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 302:
+#line 489 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_cpp_macro_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2861 "src/parser_proc.c" /* glr.c:816  */
+#line 2921 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 300:
-#line 490 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 303:
+#line 493 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2870 "src/parser_proc.c" /* glr.c:816  */
+#line 2930 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 301:
-#line 494 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 304:
+#line 497 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2879 "src/parser_proc.c" /* glr.c:816  */
+#line 2939 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 302:
-#line 498 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 305:
+#line 501 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2888 "src/parser_proc.c" /* glr.c:816  */
+#line 2948 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 326:
-#line 552 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 329:
+#line 555 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
 }
-#line 2898 "src/parser_proc.c" /* glr.c:816  */
+#line 2958 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 327:
-#line 557 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 330:
+#line 560 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init(NULL, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2908 "src/parser_proc.c" /* glr.c:816  */
+#line 2968 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 328:
-#line 565 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 331:
+#line 568 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2916 "src/parser_proc.c" /* glr.c:816  */
+#line 2976 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 329:
-#line 568 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 332:
+#line 571 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); /* FIXME */
 }
-#line 2924 "src/parser_proc.c" /* glr.c:816  */
+#line 2984 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 331:
-#line 572 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 334:
+#line 575 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 2932 "src/parser_proc.c" /* glr.c:816  */
+#line 2992 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 332:
-#line 578 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 335:
+#line 581 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2942 "src/parser_proc.c" /* glr.c:816  */
+#line 3002 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 333:
-#line 583 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 336:
+#line 586 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2952 "src/parser_proc.c" /* glr.c:816  */
+#line 3012 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 334:
-#line 591 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 337:
+#line 594 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2960 "src/parser_proc.c" /* glr.c:816  */
+#line 3020 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 336:
-#line 598 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 339:
+#line 601 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2969 "src/parser_proc.c" /* glr.c:816  */
+#line 3029 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 337:
-#line 602 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 340:
+#line 605 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2978 "src/parser_proc.c" /* glr.c:816  */
+#line 3038 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 338:
-#line 609 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 341:
+#line 612 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 2987 "src/parser_proc.c" /* glr.c:816  */
+#line 3047 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 339:
-#line 613 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 342:
+#line 616 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2996 "src/parser_proc.c" /* glr.c:816  */
+#line 3056 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 340:
-#line 617 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 343:
+#line 620 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_binary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3005 "src/parser_proc.c" /* glr.c:816  */
+#line 3065 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 341:
-#line 621 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 344:
+#line 624 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_ternary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3014 "src/parser_proc.c" /* glr.c:816  */
+#line 3074 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 342:
-#line 626 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 345:
+#line 629 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3025,11 +3085,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 3029 "src/parser_proc.c" /* glr.c:816  */
+#line 3089 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 343:
-#line 636 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 346:
+#line 639 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3040,112 +3100,112 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3044 "src/parser_proc.c" /* glr.c:816  */
+#line 3104 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 344:
-#line 646 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 347:
+#line 649 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3054 "src/parser_proc.c" /* glr.c:816  */
+#line 3114 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 345:
-#line 651 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 348:
+#line 654 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3064 "src/parser_proc.c" /* glr.c:816  */
+#line 3124 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 346:
-#line 656 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 659 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3073 "src/parser_proc.c" /* glr.c:816  */
+#line 3133 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 660 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 350:
+#line 663 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3084 "src/parser_proc.c" /* glr.c:816  */
+#line 3144 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 666 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 351:
+#line 669 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION,
                psi_cpp_macro_call_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3095 "src/parser_proc.c" /* glr.c:816  */
+#line 3155 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 349:
-#line 675 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 678 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3103 "src/parser_proc.c" /* glr.c:816  */
+#line 3163 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 351:
-#line 682 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 685 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), 
                &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3112 "src/parser_proc.c" /* glr.c:816  */
+#line 3172 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 686 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 355:
+#line 689 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3120 "src/parser_proc.c" /* glr.c:816  */
+#line 3180 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 692 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 356:
+#line 695 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const **)(&(*yyvalp))) = psi_const_init((*(struct psi_const_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_const **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3129 "src/parser_proc.c" /* glr.c:816  */
+#line 3189 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 699 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 357:
+#line 702 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const_type **)(&(*yyvalp))) = psi_const_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
 }
-#line 3137 "src/parser_proc.c" /* glr.c:816  */
+#line 3197 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 359:
-#line 712 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 362:
+#line 715 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 3145 "src/parser_proc.c" /* glr.c:816  */
+#line 3205 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 360:
-#line 715 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 363:
+#line 718 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                impl_val res = {0};
@@ -3177,28 +3237,28 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        psi_num_exp_free(&(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3181 "src/parser_proc.c" /* glr.c:816  */
+#line 3241 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 361:
-#line 746 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 364:
+#line 749 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = psi_impl_def_val_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_impl_def_val **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3190 "src/parser_proc.c" /* glr.c:816  */
+#line 3250 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 366:
-#line 760 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 763 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3198 "src/parser_proc.c" /* glr.c:816  */
+#line 3258 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 763 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 370:
+#line 766 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_VOID, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text),
@@ -3208,51 +3268,51 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3212 "src/parser_proc.c" /* glr.c:816  */
+#line 3272 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 772 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 371:
+#line 775 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3220 "src/parser_proc.c" /* glr.c:816  */
+#line 3280 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 778 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 372:
+#line 781 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3228 "src/parser_proc.c" /* glr.c:816  */
+#line 3288 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 781 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 373:
+#line 784 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3236 "src/parser_proc.c" /* glr.c:816  */
+#line 3296 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 371:
-#line 787 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 374:
+#line 790 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3244 "src/parser_proc.c" /* glr.c:816  */
+#line 3304 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 372:
-#line 790 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 793 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3252 "src/parser_proc.c" /* glr.c:816  */
+#line 3312 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 374:
-#line 797 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 800 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -3261,11 +3321,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3265 "src/parser_proc.c" /* glr.c:816  */
+#line 3325 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 805 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 378:
+#line 808 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -3277,11 +3337,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3281 "src/parser_proc.c" /* glr.c:816  */
+#line 3341 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 816 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 379:
+#line 819 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3291,11 +3351,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3295 "src/parser_proc.c" /* glr.c:816  */
+#line 3355 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 825 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 380:
+#line 828 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3305,20 +3365,20 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3309 "src/parser_proc.c" /* glr.c:816  */
+#line 3369 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 379:
-#line 838 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 841 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3318 "src/parser_proc.c" /* glr.c:816  */
+#line 3378 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 380:
-#line 842 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 383:
+#line 845 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_ENUM, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->name),
@@ -3329,11 +3389,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3333 "src/parser_proc.c" /* glr.c:816  */
+#line 3393 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 381:
-#line 852 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 384:
+#line 855 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3343,11 +3403,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3347 "src/parser_proc.c" /* glr.c:816  */
+#line 3407 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 385:
+#line 864 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3357,138 +3417,138 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3361 "src/parser_proc.c" /* glr.c:816  */
+#line 3421 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 873 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 386:
+#line 876 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3369 "src/parser_proc.c" /* glr.c:816  */
+#line 3429 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 384:
-#line 876 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 387:
+#line 879 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3377 "src/parser_proc.c" /* glr.c:816  */
+#line 3437 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 883 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 389:
+#line 886 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3386 "src/parser_proc.c" /* glr.c:816  */
+#line 3446 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 388:
-#line 891 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 391:
+#line 894 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3396 "src/parser_proc.c" /* glr.c:816  */
+#line 3456 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 389:
-#line 896 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 392:
+#line 899 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3406 "src/parser_proc.c" /* glr.c:816  */
+#line 3466 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 390:
-#line 901 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 393:
+#line 904 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3416 "src/parser_proc.c" /* glr.c:816  */
+#line 3476 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 393:
-#line 911 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 396:
+#line 914 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3424 "src/parser_proc.c" /* glr.c:816  */
+#line 3484 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 394:
-#line 917 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 397:
+#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3432 "src/parser_proc.c" /* glr.c:816  */
+#line 3492 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 395:
-#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 398:
+#line 923 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3440 "src/parser_proc.c" /* glr.c:816  */
+#line 3500 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 396:
-#line 923 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 399:
+#line 926 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3448 "src/parser_proc.c" /* glr.c:816  */
+#line 3508 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 399:
-#line 934 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 402:
+#line 937 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3456 "src/parser_proc.c" /* glr.c:816  */
+#line 3516 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 400:
-#line 937 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 403:
+#line 940 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3464 "src/parser_proc.c" /* glr.c:816  */
+#line 3524 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 401:
-#line 940 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 404:
+#line 943 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3472 "src/parser_proc.c" /* glr.c:816  */
+#line 3532 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 402:
-#line 946 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 405:
+#line 949 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3480 "src/parser_proc.c" /* glr.c:816  */
+#line 3540 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 403:
-#line 949 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 406:
+#line 952 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3488 "src/parser_proc.c" /* glr.c:816  */
+#line 3548 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 404:
-#line 952 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 407:
+#line 955 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3497,11 +3557,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3501 "src/parser_proc.c" /* glr.c:816  */
+#line 3561 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 405:
-#line 960 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 408:
+#line 963 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3511,27 +3571,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        }
 }
-#line 3515 "src/parser_proc.c" /* glr.c:816  */
+#line 3575 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 406:
-#line 972 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 409:
+#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3523 "src/parser_proc.c" /* glr.c:816  */
+#line 3583 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 407:
-#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3531 "src/parser_proc.c" /* glr.c:816  */
+#line 3591 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 408:
-#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 411:
+#line 981 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3539,19 +3599,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3543 "src/parser_proc.c" /* glr.c:816  */
+#line 3603 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 409:
-#line 985 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 412:
+#line 988 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3551 "src/parser_proc.c" /* glr.c:816  */
+#line 3611 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 410:
-#line 988 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 991 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3559,43 +3619,43 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3563 "src/parser_proc.c" /* glr.c:816  */
+#line 3623 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 411:
-#line 998 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 414:
+#line 1001 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3571 "src/parser_proc.c" /* glr.c:816  */
+#line 3631 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 1004 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 416:
+#line 1007 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3579 "src/parser_proc.c" /* glr.c:816  */
+#line 3639 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 417:
-#line 1013 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 420:
+#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3587 "src/parser_proc.c" /* glr.c:816  */
+#line 3647 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 418:
-#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 421:
+#line 1019 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3595 "src/parser_proc.c" /* glr.c:816  */
+#line 3655 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 419:
-#line 1019 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 422:
+#line 1022 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3604,92 +3664,92 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3608 "src/parser_proc.c" /* glr.c:816  */
+#line 3668 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 420:
-#line 1030 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 423:
+#line 1033 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3616 "src/parser_proc.c" /* glr.c:816  */
+#line 3676 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 421:
-#line 1033 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 424:
+#line 1036 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3624 "src/parser_proc.c" /* glr.c:816  */
+#line 3684 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 427:
-#line 1053 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 430:
+#line 1056 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3632 "src/parser_proc.c" /* glr.c:816  */
+#line 3692 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 429:
-#line 1060 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 432:
+#line 1063 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3640 "src/parser_proc.c" /* glr.c:816  */
+#line 3700 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1066 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 433:
+#line 1069 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3648 "src/parser_proc.c" /* glr.c:816  */
+#line 3708 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 431:
-#line 1069 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 434:
+#line 1072 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3656 "src/parser_proc.c" /* glr.c:816  */
+#line 3716 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1075 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 435:
+#line 1078 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3664 "src/parser_proc.c" /* glr.c:816  */
+#line 3724 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 433:
-#line 1078 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 436:
+#line 1081 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3672 "src/parser_proc.c" /* glr.c:816  */
+#line 3732 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 434:
-#line 1081 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 437:
+#line 1084 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3680 "src/parser_proc.c" /* glr.c:816  */
+#line 3740 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 441:
-#line 1102 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 444:
+#line 1105 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_decl **)(&(*yyvalp)))->abi = psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3689 "src/parser_proc.c" /* glr.c:816  */
+#line 3749 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 444:
-#line 1114 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 447:
+#line 1117 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3697,11 +3757,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3701 "src/parser_proc.c" /* glr.c:816  */
+#line 3761 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 445:
-#line 1121 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 448:
+#line 1124 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3710,11 +3770,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3714 "src/parser_proc.c" /* glr.c:816  */
+#line 3774 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 446:
-#line 1132 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1135 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3722,11 +3782,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3726 "src/parser_proc.c" /* glr.c:816  */
+#line 3786 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 447:
-#line 1139 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1142 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3735,11 +3795,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3739 "src/parser_proc.c" /* glr.c:816  */
+#line 3799 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 448:
-#line 1150 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 451:
+#line 1153 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3747,11 +3807,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3751 "src/parser_proc.c" /* glr.c:816  */
+#line 3811 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 449:
-#line 1157 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 452:
+#line 1160 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3763,11 +3823,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3767 "src/parser_proc.c" /* glr.c:816  */
+#line 3827 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 450:
-#line 1168 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1171 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3779,11 +3839,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3783 "src/parser_proc.c" /* glr.c:816  */
+#line 3843 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 451:
-#line 1179 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 454:
+#line 1182 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3795,11 +3855,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3799 "src/parser_proc.c" /* glr.c:816  */
+#line 3859 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 453:
-#line 1194 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 456:
+#line 1197 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -3809,62 +3869,62 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3813 "src/parser_proc.c" /* glr.c:816  */
+#line 3873 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 454:
-#line 1206 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1209 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3821 "src/parser_proc.c" /* glr.c:816  */
+#line 3881 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 455:
-#line 1209 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 458:
+#line 1212 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3829 "src/parser_proc.c" /* glr.c:816  */
+#line 3889 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1212 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 459:
+#line 1215 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3837 "src/parser_proc.c" /* glr.c:816  */
+#line 3897 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 457:
-#line 1215 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 460:
+#line 1218 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3845 "src/parser_proc.c" /* glr.c:816  */
+#line 3905 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 458:
-#line 1222 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 461:
+#line 1225 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3853 "src/parser_proc.c" /* glr.c:816  */
+#line 3913 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 459:
-#line 1225 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 462:
+#line 1228 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 
                psi_decl_var_init(NULL, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0)
        );
 }
-#line 3864 "src/parser_proc.c" /* glr.c:816  */
+#line 3924 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 460:
-#line 1231 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 463:
+#line 1234 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -3874,11 +3934,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3878 "src/parser_proc.c" /* glr.c:816  */
+#line 3938 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 461:
-#line 1240 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 464:
+#line 1243 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -3888,11 +3948,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3892 "src/parser_proc.c" /* glr.c:816  */
+#line 3952 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 462:
-#line 1252 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 465:
+#line 1255 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -3901,19 +3961,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3905 "src/parser_proc.c" /* glr.c:816  */
+#line 3965 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 463:
-#line 1260 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 466:
+#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3913 "src/parser_proc.c" /* glr.c:816  */
+#line 3973 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 464:
-#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 467:
+#line 1266 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -3924,11 +3984,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3928 "src/parser_proc.c" /* glr.c:816  */
+#line 3988 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 465:
-#line 1273 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 468:
+#line 1276 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -3939,31 +3999,31 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3943 "src/parser_proc.c" /* glr.c:816  */
+#line 4003 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 466:
-#line 1286 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 469:
+#line 1289 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)) + !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3953 "src/parser_proc.c" /* glr.c:816  */
+#line 4013 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 467:
-#line 1291 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1294 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3963 "src/parser_proc.c" /* glr.c:816  */
+#line 4023 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 468:
-#line 1299 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 471:
+#line 1302 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_union **)(&(*yyvalp))) = psi_decl_union_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3971,11 +4031,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_union **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_union **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 3975 "src/parser_proc.c" /* glr.c:816  */
+#line 4035 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 469:
-#line 1309 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 472:
+#line 1312 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_struct **)(&(*yyvalp))) = psi_decl_struct_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3983,27 +4043,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_struct **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_struct **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 3987 "src/parser_proc.c" /* glr.c:816  */
+#line 4047 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 470:
-#line 1319 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 473:
+#line 1322 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3995 "src/parser_proc.c" /* glr.c:816  */
+#line 4055 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 472:
-#line 1326 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 475:
+#line 1329 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4003 "src/parser_proc.c" /* glr.c:816  */
+#line 4063 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 473:
-#line 1332 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 476:
+#line 1335 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4018,11 +4078,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4022 "src/parser_proc.c" /* glr.c:816  */
+#line 4082 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 474:
-#line 1346 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 477:
+#line 1349 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4037,27 +4097,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4041 "src/parser_proc.c" /* glr.c:816  */
+#line 4101 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 475:
-#line 1363 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 478:
+#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4049 "src/parser_proc.c" /* glr.c:816  */
+#line 4109 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 476:
-#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 479:
+#line 1369 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4057 "src/parser_proc.c" /* glr.c:816  */
+#line 4117 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 477:
-#line 1372 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 480:
+#line 1375 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                struct psi_decl_arg *arg = psi_decl_arg_init(NULL, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
@@ -4065,11 +4125,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &arg);
        }
 }
-#line 4069 "src/parser_proc.c" /* glr.c:816  */
+#line 4129 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 478:
-#line 1379 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 481:
+#line 1382 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                struct psi_decl_arg *arg = psi_decl_arg_init(NULL, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
@@ -4077,180 +4137,189 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &arg);
        }
 }
-#line 4081 "src/parser_proc.c" /* glr.c:816  */
+#line 4141 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 479:
-#line 1389 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 482:
+#line 1392 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_enum **)(&(*yyvalp))) = psi_decl_enum_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_enum **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
 }
-#line 4090 "src/parser_proc.c" /* glr.c:816  */
+#line 4150 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 480:
-#line 1396 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 483:
+#line 1399 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_enum_item_free), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4098 "src/parser_proc.c" /* glr.c:816  */
+#line 4158 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 481:
-#line 1399 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 484:
+#line 1402 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4106 "src/parser_proc.c" /* glr.c:816  */
+#line 4166 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 482:
-#line 1405 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 485:
+#line 1408 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, NULL);
        (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4116 "src/parser_proc.c" /* glr.c:816  */
+#line 4176 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 483:
-#line 1410 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 486:
+#line 1413 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4126 "src/parser_proc.c" /* glr.c:816  */
+#line 4186 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 484:
-#line 1418 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 487:
+#line 1421 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 4135 "src/parser_proc.c" /* glr.c:816  */
+#line 4195 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 485:
-#line 1422 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 488:
+#line 1425 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_cast((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->token);
 }
-#line 4144 "src/parser_proc.c" /* glr.c:816  */
+#line 4204 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 486:
-#line 1426 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 489:
+#line 1429 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary(PSI_T_LPAREN, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4153 "src/parser_proc.c" /* glr.c:816  */
+#line 4213 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 487:
-#line 1430 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 490:
+#line 1433 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_binary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4162 "src/parser_proc.c" /* glr.c:816  */
+#line 4222 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 488:
-#line 1434 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 491:
+#line 1437 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4171 "src/parser_proc.c" /* glr.c:816  */
+#line 4231 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 489:
-#line 1438 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 492:
+#line 1441 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_ternary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4180 "src/parser_proc.c" /* glr.c:816  */
+#line 4240 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 490:
-#line 1445 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 493:
+#line 1448 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4189 "src/parser_proc.c" /* glr.c:816  */
+#line 4249 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 491:
-#line 1449 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 494:
+#line 1452 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4198 "src/parser_proc.c" /* glr.c:816  */
+#line 4258 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 492:
-#line 1453 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 495:
+#line 1456 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4207 "src/parser_proc.c" /* glr.c:816  */
+#line 4267 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 493:
-#line 1457 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 496:
+#line 1460 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
+       (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+}
+#line 4276 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 497:
+#line 1464 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_NAME, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 4216 "src/parser_proc.c" /* glr.c:816  */
+#line 4285 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 494:
-#line 1461 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 498:
+#line 1468 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4224 "src/parser_proc.c" /* glr.c:816  */
+#line 4293 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 495:
-#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 499:
+#line 1474 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4233 "src/parser_proc.c" /* glr.c:816  */
+#line 4302 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 496:
-#line 1471 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 500:
+#line 1478 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4242 "src/parser_proc.c" /* glr.c:816  */
+#line 4311 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 497:
-#line 1478 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 501:
+#line 1485 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4250 "src/parser_proc.c" /* glr.c:816  */
+#line 4319 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 498:
-#line 1481 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 502:
+#line 1488 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                int8_t sizeof_void_p = sizeof(void *);
@@ -4259,37 +4328,37 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_SIZEOF, (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 0);
        }
 }
-#line 4263 "src/parser_proc.c" /* glr.c:816  */
+#line 4332 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 499:
-#line 1492 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 503:
+#line 1499 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_void_p = sizeof(void *);
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
 }
-#line 4272 "src/parser_proc.c" /* glr.c:816  */
+#line 4341 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 500:
-#line 1496 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 504:
+#line 1503 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_a = sizeof('a');
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
 }
-#line 4281 "src/parser_proc.c" /* glr.c:816  */
+#line 4350 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 501:
-#line 1500 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 505:
+#line 1507 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT64, &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size, 0);
 }
-#line 4289 "src/parser_proc.c" /* glr.c:816  */
+#line 4358 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 502:
-#line 1506 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 506:
+#line 1513 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4300,11 +4369,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4304 "src/parser_proc.c" /* glr.c:816  */
+#line 4373 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 503:
-#line 1519 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 507:
+#line 1526 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4315,11 +4384,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4319 "src/parser_proc.c" /* glr.c:816  */
+#line 4388 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 504:
-#line 1532 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 508:
+#line 1539 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4330,94 +4399,94 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4334 "src/parser_proc.c" /* glr.c:816  */
+#line 4403 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 505:
-#line 1545 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 509:
+#line 1552 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 4342 "src/parser_proc.c" /* glr.c:816  */
+#line 4411 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 506:
-#line 1548 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 510:
+#line 1555 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&(*yyvalp)))->type = PSI_T_NAME;
 }
-#line 4351 "src/parser_proc.c" /* glr.c:816  */
+#line 4420 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 507:
-#line 1555 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 511:
+#line 1562 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 4359 "src/parser_proc.c" /* glr.c:816  */
+#line 4428 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 508:
-#line 1558 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 512:
+#line 1565 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(0, 0, psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text), NULL));
 }
-#line 4367 "src/parser_proc.c" /* glr.c:816  */
+#line 4436 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 509:
-#line 1561 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 513:
+#line 1568 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), NULL);
 }
-#line 4375 "src/parser_proc.c" /* glr.c:816  */
+#line 4444 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 510:
-#line 1564 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 514:
+#line 1571 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval))->text), NULL));
 }
-#line 4383 "src/parser_proc.c" /* glr.c:816  */
+#line 4452 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 511:
-#line 1570 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 515:
+#line 1577 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 4392 "src/parser_proc.c" /* glr.c:816  */
+#line 4461 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 512:
-#line 1574 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 516:
+#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text);
        (*(struct psi_layout*)(&(*yyvalp))).len = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 4401 "src/parser_proc.c" /* glr.c:816  */
+#line 4470 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 513:
-#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 517:
+#line 1588 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4409 "src/parser_proc.c" /* glr.c:816  */
+#line 4478 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 514:
-#line 1584 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 518:
+#line 1591 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4417 "src/parser_proc.c" /* glr.c:816  */
+#line 4486 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 515:
-#line 1587 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 519:
+#line 1594 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                (*(size_t*)(&(*yyvalp))) = psi_long_num_exp((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, &P->preproc->defs);
@@ -4425,88 +4494,88 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(size_t*)(&(*yyvalp))) = 0;
        }
 }
-#line 4429 "src/parser_proc.c" /* glr.c:816  */
+#line 4498 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 516:
-#line 1597 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 520:
+#line 1604 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4437 "src/parser_proc.c" /* glr.c:816  */
+#line 4506 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 517:
-#line 1600 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 521:
+#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4445 "src/parser_proc.c" /* glr.c:816  */
+#line 4514 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 519:
-#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 523:
+#line 1614 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4453 "src/parser_proc.c" /* glr.c:816  */
+#line 4522 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 520:
-#line 1613 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 524:
+#line 1620 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 4461 "src/parser_proc.c" /* glr.c:816  */
+#line 4530 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 521:
-#line 1616 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 525:
+#line 1623 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 4469 "src/parser_proc.c" /* glr.c:816  */
+#line 4538 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 524:
-#line 1633 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 528:
+#line 1640 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4477 "src/parser_proc.c" /* glr.c:816  */
+#line 4546 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 525:
-#line 1636 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 529:
+#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4486 "src/parser_proc.c" /* glr.c:816  */
+#line 4555 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 526:
-#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 530:
+#line 1650 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, NULL, (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval));
 }
-#line 4496 "src/parser_proc.c" /* glr.c:816  */
+#line 4565 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 527:
-#line 1648 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 531:
+#line 1655 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval));
 }
-#line 4506 "src/parser_proc.c" /* glr.c:816  */
+#line 4575 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 528:
-#line 1653 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 532:
+#line 1660 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-8)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval)));
@@ -4514,470 +4583,512 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))), NULL);
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4518 "src/parser_proc.c" /* glr.c:816  */
+#line 4587 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 529:
-#line 1663 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 533:
+#line 1670 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_arg_free), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4526 "src/parser_proc.c" /* glr.c:816  */
+#line 4595 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 530:
-#line 1666 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 534:
+#line 1673 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4534 "src/parser_proc.c" /* glr.c:816  */
+#line 4603 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 531:
-#line 1672 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 535:
+#line 1679 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
 }
-#line 4542 "src/parser_proc.c" /* glr.c:816  */
+#line 4611 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 532:
-#line 1675 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 536:
+#line 1682 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4550 "src/parser_proc.c" /* glr.c:816  */
+#line 4619 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 533:
-#line 1681 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 537:
+#line 1688 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_var **)(&(*yyvalp))) = psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4559 "src/parser_proc.c" /* glr.c:816  */
+#line 4628 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 534:
-#line 1688 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 538:
+#line 1695 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_type **)(&(*yyvalp))) = psi_impl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_impl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4568 "src/parser_proc.c" /* glr.c:816  */
+#line 4637 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 544:
-#line 1707 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 548:
+#line 1714 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_stmt_free), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4576 "src/parser_proc.c" /* glr.c:816  */
+#line 4645 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 545:
-#line 1710 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 549:
+#line 1717 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4584 "src/parser_proc.c" /* glr.c:816  */
+#line 4653 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 546:
-#line 1716 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 550:
+#line 1723 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_return_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4592 "src/parser_proc.c" /* glr.c:816  */
+#line 4661 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 547:
-#line 1719 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 551:
+#line 1726 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_let_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4600 "src/parser_proc.c" /* glr.c:816  */
+#line 4669 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 548:
-#line 1722 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 552:
+#line 1729 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_set_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4608 "src/parser_proc.c" /* glr.c:816  */
+#line 4677 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 549:
-#line 1725 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 553:
+#line 1732 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_assert_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4616 "src/parser_proc.c" /* glr.c:816  */
+#line 4685 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 550:
-#line 1728 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 554:
+#line 1735 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_free_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4624 "src/parser_proc.c" /* glr.c:816  */
+#line 4693 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 551:
-#line 1734 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 555:
+#line 1741 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init((*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4633 "src/parser_proc.c" /* glr.c:816  */
+#line 4702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 552:
-#line 1738 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 556:
+#line 1745 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init(psi_let_exp_init_ex((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), PSI_LET_TMP, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->exp->is_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 4643 "src/parser_proc.c" /* glr.c:816  */
+#line 4712 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 554:
-#line 1747 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 558:
+#line 1754 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = true;
 }
-#line 4652 "src/parser_proc.c" /* glr.c:816  */
+#line 4721 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 555:
-#line 1751 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 559:
+#line 1758 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = false;
 }
-#line 4661 "src/parser_proc.c" /* glr.c:816  */
+#line 4730 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 556:
-#line 1758 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 560:
+#line 1765 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4669 "src/parser_proc.c" /* glr.c:816  */
+#line 4738 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 557:
-#line 1761 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 561:
+#line 1768 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4677 "src/parser_proc.c" /* glr.c:816  */
+#line 4746 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 558:
-#line 1764 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 562:
+#line 1771 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
-       (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4686 "src/parser_proc.c" /* glr.c:816  */
+#line 4754 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 559:
-#line 1768 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 563:
+#line 1774 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLBACK, (*(struct psi_let_callback **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4694 "src/parser_proc.c" /* glr.c:816  */
+#line 4763 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 560:
-#line 1771 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 564:
+#line 1778 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, (*(struct psi_let_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLBACK, (*(struct psi_let_callback **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4702 "src/parser_proc.c" /* glr.c:816  */
+#line 4771 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 561:
-#line 1774 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 565:
+#line 1781 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, (*(struct psi_let_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4710 "src/parser_proc.c" /* glr.c:816  */
+#line 4779 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 562:
-#line 1780 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 566:
+#line 1787 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 4719 "src/parser_proc.c" /* glr.c:816  */
+#line 4788 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 563:
-#line 1784 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 567:
+#line 1791 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = 1;
        (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
 }
-#line 4729 "src/parser_proc.c" /* glr.c:816  */
+#line 4798 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 564:
-#line 1792 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 568:
+#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_calloc **)(&(*yyvalp))) = psi_let_calloc_init((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_let_calloc **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
 }
-#line 4738 "src/parser_proc.c" /* glr.c:816  */
+#line 4807 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 565:
-#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 569:
+#line 1806 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_callback **)(&(*yyvalp))) = psi_let_callback_init(psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_let_callback **)(&(*yyvalp)))->func->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)));
        (*(struct psi_let_callback **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval)));
 }
-#line 4748 "src/parser_proc.c" /* glr.c:816  */
+#line 4817 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 566:
-#line 1807 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 570:
+#line 1814 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_func **)(&(*yyvalp))) = psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_let_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_let_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4758 "src/parser_proc.c" /* glr.c:816  */
+#line 4827 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 577:
-#line 1828 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 581:
+#line 1835 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4766 "src/parser_proc.c" /* glr.c:816  */
+#line 4835 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 578:
-#line 1831 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 582:
+#line 1838 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4774 "src/parser_proc.c" /* glr.c:816  */
+#line 4843 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 579:
-#line 1837 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 583:
+#line 1844 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_let_exp_free), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4782 "src/parser_proc.c" /* glr.c:816  */
+#line 4851 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 580:
-#line 1840 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 584:
+#line 1847 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4790 "src/parser_proc.c" /* glr.c:816  */
+#line 4859 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 583:
-#line 1851 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 587:
+#line 1858 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4798 "src/parser_proc.c" /* glr.c:816  */
+#line 4867 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 584:
-#line 1854 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 588:
+#line 1861 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4806 "src/parser_proc.c" /* glr.c:816  */
+#line 4875 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 585:
-#line 1860 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 589:
+#line 1867 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4814 "src/parser_proc.c" /* glr.c:816  */
+#line 4883 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 586:
-#line 1863 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 590:
+#line 1870 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4822 "src/parser_proc.c" /* glr.c:816  */
+#line 4891 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 587:
-#line 1869 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 591:
+#line 1876 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))));
+       (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init((*(struct psi_return_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_return_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4831 "src/parser_proc.c" /* glr.c:816  */
+#line 4900 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 588:
-#line 1876 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 592:
+#line 1883 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
+       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->token);
+}
+#line 4909 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 593:
+#line 1887 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
+       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
+}
+#line 4918 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 594:
+#line 1894 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
+}
+#line 4926 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 595:
+#line 1897 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
+}
+#line 4934 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 596:
+#line 1900 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+}
+#line 4942 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 597:
+#line 1906 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_stmt **)(&(*yyvalp))) = psi_set_stmt_init((*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_set_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4840 "src/parser_proc.c" /* glr.c:816  */
+#line 4951 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 589:
-#line 1883 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 598:
+#line 1913 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4848 "src/parser_proc.c" /* glr.c:816  */
+#line 4959 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 590:
-#line 1886 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 599:
+#line 1916 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4856 "src/parser_proc.c" /* glr.c:816  */
+#line 4967 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 591:
-#line 1889 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 600:
+#line 1919 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = (*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_set_exp **)(&(*yyvalp)))->var = (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 4865 "src/parser_proc.c" /* glr.c:816  */
+#line 4976 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 592:
-#line 1896 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 601:
+#line 1926 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4875 "src/parser_proc.c" /* glr.c:816  */
+#line 4986 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 593:
-#line 1901 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 602:
+#line 1931 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->recursive = 1;
 }
-#line 4885 "src/parser_proc.c" /* glr.c:816  */
+#line 4996 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 602:
-#line 1920 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 611:
+#line 1950 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4893 "src/parser_proc.c" /* glr.c:816  */
+#line 5004 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 603:
-#line 1923 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 612:
+#line 1953 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4901 "src/parser_proc.c" /* glr.c:816  */
+#line 5012 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 604:
-#line 1929 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 613:
+#line 1959 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4909 "src/parser_proc.c" /* glr.c:816  */
+#line 5020 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 605:
-#line 1932 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 614:
+#line 1962 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4917 "src/parser_proc.c" /* glr.c:816  */
+#line 5028 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 606:
-#line 1938 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 615:
+#line 1968 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_assert_stmt **)(&(*yyvalp))) = psi_assert_stmt_init((enum psi_assert_kind) (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_assert_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4926 "src/parser_proc.c" /* glr.c:816  */
+#line 5037 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 609:
-#line 1950 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 618:
+#line 1980 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_free_stmt **)(&(*yyvalp))) = psi_free_stmt_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_free_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4935 "src/parser_proc.c" /* glr.c:816  */
+#line 5046 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 610:
-#line 1957 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 619:
+#line 1987 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_free_exp_free), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4943 "src/parser_proc.c" /* glr.c:816  */
+#line 5054 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 611:
-#line 1960 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 620:
+#line 1990 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4951 "src/parser_proc.c" /* glr.c:816  */
+#line 5062 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 612:
-#line 1966 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 621:
+#line 1996 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_free_exp **)(&(*yyvalp))) = psi_free_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_free_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4961 "src/parser_proc.c" /* glr.c:816  */
+#line 5072 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 613:
-#line 1974 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 622:
+#line 2004 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 4969 "src/parser_proc.c" /* glr.c:816  */
+#line 5080 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 614:
-#line 1977 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 623:
+#line 2007 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 4977 "src/parser_proc.c" /* glr.c:816  */
+#line 5088 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 4981 "src/parser_proc.c" /* glr.c:816  */
+#line 5092 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -5025,700 +5136,712 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-          case 128: /* binary_op_token  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+          case 129: /* binary_op_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5032 "src/parser_proc.c" /* glr.c:846  */
+#line 5143 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 129: /* unary_op_token  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 130: /* unary_op_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5038 "src/parser_proc.c" /* glr.c:846  */
+#line 5149 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 130: /* name_token  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 131: /* name_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5044 "src/parser_proc.c" /* glr.c:846  */
+#line 5155 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 131: /* any_noeol_token  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 132: /* any_noeol_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5050 "src/parser_proc.c" /* glr.c:846  */
+#line 5161 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 136: /* lib  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 137: /* lib  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5056 "src/parser_proc.c" /* glr.c:846  */
+#line 5167 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 137: /* cpp  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 138: /* cpp  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5062 "src/parser_proc.c" /* glr.c:846  */
+#line 5173 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 138: /* cpp_exp  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 139: /* cpp_exp  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5068 "src/parser_proc.c" /* glr.c:846  */
+#line 5179 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 140: /* cpp_message_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 141: /* cpp_message_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5074 "src/parser_proc.c" /* glr.c:846  */
+#line 5185 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 141: /* cpp_include_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 142: /* cpp_include_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5080 "src/parser_proc.c" /* glr.c:846  */
+#line 5191 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 142: /* cpp_header_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 143: /* cpp_header_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5086 "src/parser_proc.c" /* glr.c:846  */
+#line 5197 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 143: /* cpp_no_arg_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 144: /* cpp_no_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5092 "src/parser_proc.c" /* glr.c:846  */
+#line 5203 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 144: /* cpp_name_arg_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 145: /* cpp_name_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5098 "src/parser_proc.c" /* glr.c:846  */
+#line 5209 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 145: /* cpp_exp_arg_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 146: /* cpp_exp_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5104 "src/parser_proc.c" /* glr.c:846  */
+#line 5215 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 146: /* cpp_special_name_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 147: /* cpp_special_name_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5110 "src/parser_proc.c" /* glr.c:846  */
+#line 5221 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 147: /* cpp_macro_decl  */
-#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 148: /* cpp_macro_decl  */
+#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 5116 "src/parser_proc.c" /* glr.c:846  */
+#line 5227 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 148: /* cpp_macro_sig  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 149: /* cpp_macro_sig  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5122 "src/parser_proc.c" /* glr.c:846  */
+#line 5233 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 149: /* cpp_macro_sig_args  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 150: /* cpp_macro_sig_args  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5128 "src/parser_proc.c" /* glr.c:846  */
+#line 5239 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 150: /* cpp_macro_decl_tokens  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 151: /* cpp_macro_decl_tokens  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5134 "src/parser_proc.c" /* glr.c:846  */
+#line 5245 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 151: /* cpp_macro_decl_token_list  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 152: /* cpp_macro_decl_token_list  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5140 "src/parser_proc.c" /* glr.c:846  */
+#line 5251 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 152: /* cpp_macro_exp  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 153: /* cpp_macro_exp  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5146 "src/parser_proc.c" /* glr.c:846  */
+#line 5257 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 153: /* cpp_macro_call_args  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 154: /* cpp_macro_call_args  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5152 "src/parser_proc.c" /* glr.c:846  */
+#line 5263 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 154: /* cpp_macro_call_arg_list  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 155: /* cpp_macro_call_arg_list  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5158 "src/parser_proc.c" /* glr.c:846  */
+#line 5269 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 155: /* constant  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 156: /* constant  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 5164 "src/parser_proc.c" /* glr.c:846  */
+#line 5275 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 156: /* constant_type  */
-#line 284 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 157: /* constant_type  */
+#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 5170 "src/parser_proc.c" /* glr.c:846  */
+#line 5281 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 157: /* constant_type_token  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 158: /* constant_type_token  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5176 "src/parser_proc.c" /* glr.c:846  */
+#line 5287 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 158: /* impl_def_val  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 159: /* impl_def_val  */
+#line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 5182 "src/parser_proc.c" /* glr.c:846  */
+#line 5293 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 159: /* impl_def_val_token  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 160: /* impl_def_val_token  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5188 "src/parser_proc.c" /* glr.c:846  */
+#line 5299 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 160: /* decl_typedef  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 161: /* decl_typedef  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5194 "src/parser_proc.c" /* glr.c:846  */
+#line 5305 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 161: /* typedef  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 162: /* typedef  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5200 "src/parser_proc.c" /* glr.c:846  */
+#line 5311 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 162: /* typedef_anon  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 163: /* typedef_anon  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5206 "src/parser_proc.c" /* glr.c:846  */
+#line 5317 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 163: /* typedef_decl  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 164: /* typedef_decl  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5212 "src/parser_proc.c" /* glr.c:846  */
+#line 5323 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 164: /* typedef_anon_decl  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 165: /* typedef_anon_decl  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5218 "src/parser_proc.c" /* glr.c:846  */
+#line 5329 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 165: /* qualified_decl_type  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 166: /* qualified_decl_type  */
+#line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5224 "src/parser_proc.c" /* glr.c:846  */
+#line 5335 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 166: /* decl_type  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 167: /* decl_type  */
+#line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5230 "src/parser_proc.c" /* glr.c:846  */
+#line 5341 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 167: /* decl_type_complex  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 168: /* decl_type_complex  */
+#line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5236 "src/parser_proc.c" /* glr.c:846  */
+#line 5347 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 168: /* decl_type_simple  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 169: /* decl_type_simple  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5242 "src/parser_proc.c" /* glr.c:846  */
+#line 5353 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 169: /* decl_real_type  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 170: /* decl_real_type  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5248 "src/parser_proc.c" /* glr.c:846  */
+#line 5359 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 170: /* int_signed  */
-#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 171: /* int_signed  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5254 "src/parser_proc.c" /* glr.c:846  */
+#line 5365 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 171: /* int_width  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 172: /* int_width  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5260 "src/parser_proc.c" /* glr.c:846  */
+#line 5371 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 172: /* decl_int_type  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 173: /* decl_int_type  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5266 "src/parser_proc.c" /* glr.c:846  */
+#line 5377 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 173: /* int_signed_types  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 174: /* int_signed_types  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5272 "src/parser_proc.c" /* glr.c:846  */
+#line 5383 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 174: /* signed_short_types  */
-#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 175: /* signed_short_types  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5278 "src/parser_proc.c" /* glr.c:846  */
+#line 5389 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 175: /* signed_long_types  */
-#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 176: /* signed_long_types  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5284 "src/parser_proc.c" /* glr.c:846  */
+#line 5395 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 176: /* int_width_types  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 177: /* int_width_types  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5290 "src/parser_proc.c" /* glr.c:846  */
+#line 5401 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 177: /* decl_stmt  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 178: /* decl_stmt  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5296 "src/parser_proc.c" /* glr.c:846  */
+#line 5407 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 183: /* decl_vars  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 184: /* decl_vars  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5302 "src/parser_proc.c" /* glr.c:846  */
+#line 5413 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 188: /* decl  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 189: /* decl  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5308 "src/parser_proc.c" /* glr.c:846  */
+#line 5419 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 189: /* decl_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 190: /* decl_body  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5314 "src/parser_proc.c" /* glr.c:846  */
+#line 5425 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 190: /* decl_func_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 191: /* decl_func_body  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5320 "src/parser_proc.c" /* glr.c:846  */
+#line 5431 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 191: /* decl_functor_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 192: /* decl_functor_body  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5326 "src/parser_proc.c" /* glr.c:846  */
+#line 5437 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 192: /* decl_functor  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 193: /* decl_functor  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5332 "src/parser_proc.c" /* glr.c:846  */
+#line 5443 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 193: /* decl_func  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 194: /* decl_func  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5338 "src/parser_proc.c" /* glr.c:846  */
+#line 5449 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 194: /* decl_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 195: /* decl_args  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5344 "src/parser_proc.c" /* glr.c:846  */
+#line 5455 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 195: /* decl_anon_arg  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 196: /* decl_anon_arg  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5350 "src/parser_proc.c" /* glr.c:846  */
+#line 5461 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 196: /* decl_arg  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 197: /* decl_arg  */
+#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5356 "src/parser_proc.c" /* glr.c:846  */
+#line 5467 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 197: /* decl_var  */
-#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 198: /* decl_var  */
+#line 299 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 5362 "src/parser_proc.c" /* glr.c:846  */
+#line 5473 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 198: /* decl_union  */
-#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 199: /* decl_union  */
+#line 303 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 5368 "src/parser_proc.c" /* glr.c:846  */
+#line 5479 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 199: /* decl_struct  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 200: /* decl_struct  */
+#line 301 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 5374 "src/parser_proc.c" /* glr.c:846  */
+#line 5485 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 200: /* decl_struct_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 201: /* decl_struct_args  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5380 "src/parser_proc.c" /* glr.c:846  */
+#line 5491 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 201: /* struct_args_block  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 202: /* struct_args_block  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5386 "src/parser_proc.c" /* glr.c:846  */
+#line 5497 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 202: /* struct_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 203: /* struct_args  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5392 "src/parser_proc.c" /* glr.c:846  */
+#line 5503 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 203: /* struct_arg_var_list  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 204: /* struct_arg_var_list  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5398 "src/parser_proc.c" /* glr.c:846  */
+#line 5509 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 204: /* decl_vars_with_layout  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 205: /* decl_vars_with_layout  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5404 "src/parser_proc.c" /* glr.c:846  */
+#line 5515 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 205: /* decl_enum  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 206: /* decl_enum  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 5410 "src/parser_proc.c" /* glr.c:846  */
+#line 5521 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 206: /* decl_enum_items  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 207: /* decl_enum_items  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5416 "src/parser_proc.c" /* glr.c:846  */
+#line 5527 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 207: /* decl_enum_item  */
-#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 208: /* decl_enum_item  */
+#line 307 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 5422 "src/parser_proc.c" /* glr.c:846  */
+#line 5533 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 208: /* num_exp  */
-#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 209: /* num_exp  */
+#line 365 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5428 "src/parser_proc.c" /* glr.c:846  */
+#line 5539 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 209: /* number  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 210: /* number  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5434 "src/parser_proc.c" /* glr.c:846  */
+#line 5545 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 210: /* sizeof  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 211: /* sizeof  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5440 "src/parser_proc.c" /* glr.c:846  */
+#line 5551 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 211: /* sizeof_body  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 212: /* sizeof_body  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5446 "src/parser_proc.c" /* glr.c:846  */
+#line 5557 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 212: /* sizeof_body_notypes  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 213: /* sizeof_body_notypes  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5452 "src/parser_proc.c" /* glr.c:846  */
+#line 5563 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 213: /* enum_name  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 214: /* enum_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5458 "src/parser_proc.c" /* glr.c:846  */
+#line 5569 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 214: /* union_name  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 215: /* union_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5464 "src/parser_proc.c" /* glr.c:846  */
+#line 5575 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 215: /* struct_name  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 216: /* struct_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5470 "src/parser_proc.c" /* glr.c:846  */
+#line 5581 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 216: /* optional_name  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 217: /* optional_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5476 "src/parser_proc.c" /* glr.c:846  */
+#line 5587 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 217: /* decl_layout  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 218: /* decl_layout  */
+#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 5482 "src/parser_proc.c" /* glr.c:846  */
+#line 5593 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 218: /* align_and_size  */
-#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 219: /* align_and_size  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5488 "src/parser_proc.c" /* glr.c:846  */
+#line 5599 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 219: /* array_size  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 220: /* array_size  */
+#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5494 "src/parser_proc.c" /* glr.c:846  */
+#line 5605 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 220: /* indirection  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 221: /* indirection  */
+#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5500 "src/parser_proc.c" /* glr.c:846  */
+#line 5611 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 221: /* pointers  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 222: /* pointers  */
+#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5506 "src/parser_proc.c" /* glr.c:846  */
+#line 5617 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 222: /* asterisks  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 223: /* asterisks  */
+#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5512 "src/parser_proc.c" /* glr.c:846  */
+#line 5623 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 224: /* impl  */
-#line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 225: /* impl  */
+#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 5518 "src/parser_proc.c" /* glr.c:846  */
+#line 5629 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 225: /* impl_func  */
-#line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 226: /* impl_func  */
+#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 5524 "src/parser_proc.c" /* glr.c:846  */
+#line 5635 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 226: /* impl_args  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 227: /* impl_args  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5530 "src/parser_proc.c" /* glr.c:846  */
+#line 5641 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 227: /* impl_arg  */
-#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 228: /* impl_arg  */
+#line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5536 "src/parser_proc.c" /* glr.c:846  */
+#line 5647 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 228: /* impl_var  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 229: /* impl_var  */
+#line 328 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5542 "src/parser_proc.c" /* glr.c:846  */
+#line 5653 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 229: /* impl_type  */
-#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 230: /* impl_type  */
+#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5548 "src/parser_proc.c" /* glr.c:846  */
+#line 5659 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 230: /* impl_type_token  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 231: /* impl_type_token  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5554 "src/parser_proc.c" /* glr.c:846  */
+#line 5665 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 231: /* impl_stmts  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 232: /* impl_stmts  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5560 "src/parser_proc.c" /* glr.c:846  */
+#line 5671 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 232: /* impl_stmt  */
-#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 233: /* impl_stmt  */
+#line 358 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5566 "src/parser_proc.c" /* glr.c:846  */
+#line 5677 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 233: /* let_stmt  */
-#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 234: /* let_stmt  */
+#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5572 "src/parser_proc.c" /* glr.c:846  */
+#line 5683 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 234: /* let_exp  */
-#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 235: /* let_exp  */
+#line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5578 "src/parser_proc.c" /* glr.c:846  */
+#line 5689 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 235: /* let_exp_byref  */
-#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 236: /* let_exp_byref  */
+#line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5584 "src/parser_proc.c" /* glr.c:846  */
+#line 5695 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 236: /* let_exp_assign  */
-#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 237: /* let_exp_assign  */
+#line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5590 "src/parser_proc.c" /* glr.c:846  */
+#line 5701 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 237: /* let_calloc  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 238: /* let_calloc  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5596 "src/parser_proc.c" /* glr.c:846  */
+#line 5707 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 238: /* let_callback  */
-#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 239: /* let_callback  */
+#line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5602 "src/parser_proc.c" /* glr.c:846  */
+#line 5713 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 239: /* let_func  */
-#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 240: /* let_func  */
+#line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5608 "src/parser_proc.c" /* glr.c:846  */
+#line 5719 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 240: /* let_func_token  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 241: /* let_func_token  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5614 "src/parser_proc.c" /* glr.c:846  */
+#line 5725 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 241: /* let_func_exps  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 242: /* let_func_exps  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5620 "src/parser_proc.c" /* glr.c:846  */
+#line 5731 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 242: /* let_exps  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 243: /* let_exps  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5626 "src/parser_proc.c" /* glr.c:846  */
+#line 5737 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 243: /* callback_rval  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 244: /* callback_rval  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5632 "src/parser_proc.c" /* glr.c:846  */
+#line 5743 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 244: /* callback_arg_list  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 245: /* callback_arg_list  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5638 "src/parser_proc.c" /* glr.c:846  */
+#line 5749 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 245: /* callback_args  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 246: /* callback_args  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5644 "src/parser_proc.c" /* glr.c:846  */
+#line 5755 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 246: /* return_stmt  */
-#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 247: /* return_stmt  */
+#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5650 "src/parser_proc.c" /* glr.c:846  */
+#line 5761 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 248: /* return_exp  */
+#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_return_exp_free(&(*(struct psi_return_exp **)(&(*yyvaluep))));}
+#line 5767 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 249: /* call_decl_vars  */
+#line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
+#line 5773 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 247: /* set_stmt  */
-#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 250: /* set_stmt  */
+#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5656 "src/parser_proc.c" /* glr.c:846  */
+#line 5779 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 248: /* set_exp  */
-#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 251: /* set_exp  */
+#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5662 "src/parser_proc.c" /* glr.c:846  */
+#line 5785 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 249: /* set_func  */
-#line 344 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 252: /* set_func  */
+#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5668 "src/parser_proc.c" /* glr.c:846  */
+#line 5791 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 250: /* set_func_token  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 253: /* set_func_token  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5674 "src/parser_proc.c" /* glr.c:846  */
+#line 5797 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 251: /* set_func_exps  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 254: /* set_func_exps  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5680 "src/parser_proc.c" /* glr.c:846  */
+#line 5803 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 252: /* set_exps  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 255: /* set_exps  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5686 "src/parser_proc.c" /* glr.c:846  */
+#line 5809 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 253: /* assert_stmt  */
-#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 256: /* assert_stmt  */
+#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5692 "src/parser_proc.c" /* glr.c:846  */
+#line 5815 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 254: /* assert_stmt_token  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 257: /* assert_stmt_token  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5698 "src/parser_proc.c" /* glr.c:846  */
+#line 5821 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 255: /* free_stmt  */
-#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 258: /* free_stmt  */
+#line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5704 "src/parser_proc.c" /* glr.c:846  */
+#line 5827 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 256: /* free_exps  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 259: /* free_exps  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5710 "src/parser_proc.c" /* glr.c:846  */
+#line 5833 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 257: /* free_exp  */
-#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 260: /* free_exp  */
+#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5716 "src/parser_proc.c" /* glr.c:846  */
+#line 5839 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 258: /* reference  */
-#line 369 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 261: /* reference  */
+#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5722 "src/parser_proc.c" /* glr.c:846  */
+#line 5845 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -5775,7 +5898,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-695)))
+  (!!((Yystate) == (-692)))
 
 /** True iff LR state YYSTATE has only a default reduction (regardless
  *  of token).  */
@@ -7071,7 +7194,7 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
 {
 }
 
-#line 7075 "src/parser_proc.c" /* glr.c:2270  */
+#line 7198 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -7377,7 +7500,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 1986 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 2016 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index 18e5a85c32d5f56217c152eaf6e82d654247c3d6..b336db1fcb24f91ac3967c03fa1a91463359c904 100644 (file)
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -150,36 +150,37 @@ struct psi_parser;
     PSI_T_TEMP = 349,
     PSI_T_FREE = 350,
     PSI_T_RETURN = 351,
-    PSI_T_PRE_ASSERT = 352,
-    PSI_T_POST_ASSERT = 353,
-    PSI_T_BOOLVAL = 354,
-    PSI_T_INTVAL = 355,
-    PSI_T_STRVAL = 356,
-    PSI_T_PATHVAL = 357,
-    PSI_T_STRLEN = 358,
-    PSI_T_FLOATVAL = 359,
-    PSI_T_ARRVAL = 360,
-    PSI_T_OBJVAL = 361,
-    PSI_T_COUNT = 362,
-    PSI_T_CALLOC = 363,
-    PSI_T_TO_BOOL = 364,
-    PSI_T_TO_INT = 365,
-    PSI_T_TO_STRING = 366,
-    PSI_T_TO_FLOAT = 367,
-    PSI_T_TO_ARRAY = 368,
-    PSI_T_TO_OBJECT = 369,
-    PSI_T_COMMENT = 370,
-    PSI_T_WHITESPACE = 371,
-    PSI_T_NO_WHITESPACE = 372,
-    PSI_T_CPP_HEADER = 373,
-    PSI_T_CPP_ATTRIBUTE = 374,
-    PSI_T_CPP_EXTENSION = 375,
-    PSI_T_CPP_PASTE = 376,
-    PSI_T_CPP_INLINE = 377,
-    PSI_T_CPP_RESTRICT = 378,
-    PSI_T_CPP_ASM = 379,
-    PSI_T_BINARY = 380,
-    PSI_T_UNARY = 381
+    PSI_T_AS = 352,
+    PSI_T_PRE_ASSERT = 353,
+    PSI_T_POST_ASSERT = 354,
+    PSI_T_BOOLVAL = 355,
+    PSI_T_INTVAL = 356,
+    PSI_T_STRVAL = 357,
+    PSI_T_PATHVAL = 358,
+    PSI_T_STRLEN = 359,
+    PSI_T_FLOATVAL = 360,
+    PSI_T_ARRVAL = 361,
+    PSI_T_OBJVAL = 362,
+    PSI_T_COUNT = 363,
+    PSI_T_CALLOC = 364,
+    PSI_T_TO_BOOL = 365,
+    PSI_T_TO_INT = 366,
+    PSI_T_TO_STRING = 367,
+    PSI_T_TO_FLOAT = 368,
+    PSI_T_TO_ARRAY = 369,
+    PSI_T_TO_OBJECT = 370,
+    PSI_T_COMMENT = 371,
+    PSI_T_WHITESPACE = 372,
+    PSI_T_NO_WHITESPACE = 373,
+    PSI_T_CPP_HEADER = 374,
+    PSI_T_CPP_ATTRIBUTE = 375,
+    PSI_T_CPP_EXTENSION = 376,
+    PSI_T_CPP_PASTE = 377,
+    PSI_T_CPP_INLINE = 378,
+    PSI_T_CPP_RESTRICT = 379,
+    PSI_T_CPP_ASM = 380,
+    PSI_T_BINARY = 381,
+    PSI_T_UNARY = 382
   };
 #endif
 
@@ -341,12 +342,16 @@ union YYSTYPE
   struct psi_plist * PSI_T_callback_arg_list;
   /* callback_args  */
   struct psi_plist * PSI_T_callback_args;
+  /* call_decl_vars  */
+  struct psi_plist * PSI_T_call_decl_vars;
   /* set_func_exps  */
   struct psi_plist * PSI_T_set_func_exps;
   /* set_exps  */
   struct psi_plist * PSI_T_set_exps;
   /* free_exps  */
   struct psi_plist * PSI_T_free_exps;
+  /* return_exp  */
+  struct psi_return_exp * PSI_T_return_exp;
   /* return_stmt  */
   struct psi_return_stmt * PSI_T_return_stmt;
   /* set_exp  */
@@ -545,6 +550,8 @@ union YYSTYPE
   struct psi_token * PSI_T_FREE;
   /* RETURN  */
   struct psi_token * PSI_T_RETURN;
+  /* AS  */
+  struct psi_token * PSI_T_AS;
   /* PRE_ASSERT  */
   struct psi_token * PSI_T_PRE_ASSERT;
   /* POST_ASSERT  */
@@ -667,7 +674,7 @@ union YYSTYPE
   struct psi_token * PSI_T_assert_stmt_token;
   /* impl_stmt  */
   struct psi_token ** PSI_T_impl_stmt;
-#line 671 "src/parser_proc.h" /* glr.c:197  */
+#line 678 "src/parser_proc.h" /* glr.c:197  */
 };
 
 typedef union YYSTYPE YYSTYPE;

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index b3e20d334c0e397c4bdf85c57c23d8f03a668c28..408a09337ffa4068f44d773fdec703cde58d81e0 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -206,6 +206,7 @@ struct psi_parser;
 %token <struct psi_token *> TEMP
 %token <struct psi_token *> FREE
 %token <struct psi_token *> RETURN
+%token <struct psi_token *> AS
 %token <struct psi_token *> PRE_ASSERT
 %token <struct psi_token *> POST_ASSERT
 %token <struct psi_token *> BOOLVAL
@@ -304,8 +305,8 @@ struct psi_parser;
 %destructor    {psi_decl_enum_free(&$$);}                      decl_enum
 %type          <struct psi_decl_enum_item *>           decl_enum_item
 %destructor    {psi_decl_enum_item_free(&$$);}         decl_enum_item
-%type          <struct psi_plist *>                            decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout
-%destructor    {psi_plist_free($$);}                           decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout
+%type          <struct psi_plist *>                            decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
+%destructor    {psi_plist_free($$);}                           decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout call_decl_vars
 
 %type          <struct psi_layout>                                     align_and_size
 %destructor    {}                                                                      align_and_size
@@ -346,6 +347,8 @@ struct psi_parser;
 %destructor    {psi_assert_stmt_free(&$$);}            assert_stmt
 %type          <struct psi_return_stmt *>                      return_stmt
 %destructor    {psi_return_stmt_free(&$$);}            return_stmt
+%type          <struct psi_return_exp *>                       return_exp
+%destructor    {psi_return_exp_free(&$$);}                     return_exp
 %type          <struct psi_free_stmt *>                        free_stmt
 %destructor    {psi_free_stmt_free(&$$);}                      free_stmt
 %type          <struct psi_free_exp *>                         free_exp
@@ -375,9 +378,9 @@ struct psi_parser;
 
 binary_op_token: PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | RCHEVR | LCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE ; 
 unary_op_token: TILDE | NOT | PLUS | MINUS ;
-name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token;
-any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
-any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
+name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | AS | let_func_token | set_func_token;
+any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE | AS;
+any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE | AS;
 
 
 file:
@@ -712,7 +715,7 @@ impl_def_val[val]:
        %empty {
        $val = NULL;
 }
-|      num_exp[num] {
+|      num_exp[num] %dprec 1 {
        if (psi_num_exp_validate(PSI_DATA(P), $num, NULL, NULL, NULL, NULL, NULL)) {
                impl_val res = {0};
                token_t type = psi_num_exp_exec($num, &res, NULL, &P->preproc->defs);
@@ -743,7 +746,7 @@ impl_def_val[val]:
        }
        psi_num_exp_free(&$num);
 }
-|      impl_def_val_token[token] {
+|      impl_def_val_token[token] %dprec 2 {
        $val = psi_impl_def_val_init($token->type, $token->text);
        $val->token = psi_token_copy($token);
 }
@@ -1454,6 +1457,10 @@ number[num]:
        $num = psi_number_init($token->type, $token->text, 0);
        $num->token = psi_token_copy($token);
 }
+|      NULL[token] {
+       $num = psi_number_init($token->type, $token->text, 0);
+       $num->token = psi_token_copy($token);
+}
 |      decl_var {
        $num = psi_number_init(PSI_T_NAME, $decl_var, 0);
        $num->token = psi_token_copy($decl_var->token);
@@ -1755,9 +1762,12 @@ let_exp[exp]:
 ;
 
 let_exp_byref[exp]:
-       NULL {
+       NULL %dprec 2 {
        $exp = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
+|      num_exp[num] %dprec 1 {
+       $exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num);
+}
 |      let_calloc[calloc] {
        $exp = psi_let_exp_init(PSI_LET_CALLOC, $calloc);
 }
@@ -1771,9 +1781,6 @@ let_exp_byref[exp]:
 |      let_func[func] {
        $exp = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, $func);
 }
-|      num_exp[num] {
-       $exp = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, $num);
-}
 ;
 
 let_exp_assign[exp]: 
@@ -1866,12 +1873,35 @@ callback_args[args]:
 ;
 
 return_stmt[return]:
-       RETURN set_func[func] EOS {
-       $return = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, $func));
+       RETURN return_exp EOS {
+       $return = psi_return_stmt_init($return_exp);
        $return->token = psi_token_copy($RETURN);
 }
 ;
 
+return_exp:
+       decl_var[func] LPAREN call_decl_vars[args] RPAREN AS set_func {
+       $return_exp = psi_return_exp_init($func, $args, psi_set_exp_init(PSI_SET_FUNC, $set_func));
+       $return_exp->token = psi_token_copy($func->token);
+}
+|      set_func {
+       $return_exp = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, $set_func));
+       $return_exp->token = psi_token_copy($set_func->token);
+}
+;
+
+call_decl_vars[args]:
+       %empty {
+       $args = NULL;
+}
+|      VOID {
+       $args = NULL;
+}
+|      decl_vars[vars] {
+       $args = $vars;
+}
+;
+
 set_stmt[set]:
        SET set_exp[exp] EOS {
        $set = psi_set_stmt_init($exp);

diff --git a/src/plist.c b/src/plist.c
index 25f6676ca9a2c110f6bb5a0800f2f59c81901d69..1a69fc1722c7b650a42500a8ac369962d08a534b 100644 (file)
--- a/src/plist.c
+++ b/src/plist.c
@@ -69,15 +69,19 @@ struct psi_plist *psi_plist_init_ex(size_t size, void (*dtor)(void *)) {
 void psi_plist_clean(struct psi_plist *list) {
        size_t i;
 
-       if (list->dtor) for (i = 0; i < list->count; ++i) {
-               list->dtor(PLIST_ELE(list, i));
+       if (list) {
+               if (list->dtor) for (i = 0; i < list->count; ++i) {
+                       list->dtor(PLIST_ELE(list, i));
+               }
+               list->count = 0;
        }
-       list->count = 0;
 }
 
 void psi_plist_free(struct psi_plist *list) {
-       psi_plist_clean(list);
-       free(list);
+       if (list) {
+               psi_plist_clean(list);
+               free(list);
+       }
 }
 
 struct psi_plist *psi_plist_copy(struct psi_plist *list, void (*ctor)(void *))

diff --git a/src/types.h b/src/types.h
index 58a50f55e4697d60d4bf9a9831bdfa12889f6b3a..4e29a4577dfa3bb18e2934c2098934c09728c9da 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -55,6 +55,7 @@
 #include "types/set_exp.h"
 #include "types/set_stmt.h"
 #include "types/return_stmt.h"
+#include "types/return_exp.h"
 #include "types/free_stmt.h"
 #include "types/impl.h"
 #include "types/decl_file.h"

diff --git a/src/types/decl_var.c b/src/types/decl_var.c
index 60431d551a0eb8d530c99959db3b5fe79393efa7..236ccfc843f7c9af5abd267e7334dc649a19142f 100644 (file)
--- a/src/types/decl_var.c
+++ b/src/types/decl_var.c
@@ -86,13 +86,17 @@ void psi_decl_var_dump(int fd, struct psi_decl_var *var)
 }
 
 bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
-               struct psi_decl *decl, struct psi_let_exp *let_exp,
-               struct psi_set_exp *set_exp)
+               struct psi_impl *impl, struct psi_decl *decl,
+               struct psi_let_exp *let_exp, struct psi_set_exp *set_exp)
 {
        bool okay = false;
        struct psi_let_exp *current_let_exp = let_exp;
        struct psi_set_exp *current_set_exp = set_exp;
 
+       if (dvar->arg) {
+               return true;
+       }
+
        if (current_let_exp) {
                /* walk up the let expression tree until found */
                while ((current_let_exp = current_let_exp->outer)) {
@@ -137,7 +141,10 @@ bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
                }
        }
 
-       if (decl && !okay && psi_decl_get_arg(decl, dvar)) {
+       if (!okay && impl && psi_impl_get_decl_arg(impl, dvar)) {
+               okay = true;
+       }
+       if (!okay && decl && psi_decl_get_arg(decl, dvar)) {
                okay = true;
        }
 

diff --git a/src/types/decl_var.h b/src/types/decl_var.h
index ba7332166ff2882babd771a7d4e3f85b36c9d05f..031e2919df49d41b16ac237424d346e1c5f4d4d7 100644 (file)
--- a/src/types/decl_var.h
+++ b/src/types/decl_var.h
@@ -60,7 +60,8 @@ static inline char *psi_decl_var_name_prepend(char *current, const char *prepend
        return current;
 }
 
-bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar, struct psi_decl *decl,
+bool psi_decl_var_validate(struct psi_data *data, struct psi_decl_var *dvar,
+               struct psi_impl *impl, struct psi_decl *decl,
                struct psi_let_exp *current_let_exp, struct psi_set_exp *current_set_exp);
 
 size_t psi_decl_var_get_size(struct psi_decl_var *var);

diff --git a/src/types/impl.c b/src/types/impl.c
index e679f1f2add7ae8fa49135a5dc697f837aa26e97..e9bd39bebec5723c636a5731e10e7043cca91e5e 100644 (file)
--- a/src/types/impl.c
+++ b/src/types/impl.c
@@ -176,6 +176,27 @@ void psi_impl_stmt_free(struct psi_token ***abstract_stmt)
        }
 }
 
+struct psi_decl_arg *psi_impl_get_decl_arg(struct psi_impl *impl,
+               struct psi_decl_var *var)
+{
+       struct psi_return_stmt *ret;
+
+       if (psi_plist_get(impl->stmts.ret, 0, &ret)) {
+               if (ret->exp->args) {
+                       size_t i = 0;
+                       struct psi_decl_var *arg;
+
+                       while (psi_plist_get(ret->exp->args, i++, &arg)) {
+                               if (!strcmp(var->name, arg->name)) {
+                                       return var->arg = arg->arg;
+                               }
+                       }
+               }
+       }
+
+       return psi_decl_get_arg(impl->decl, var);
+}
+
 struct psi_let_stmt *psi_impl_get_let(struct psi_impl *impl,
                struct psi_decl_var* var)
 {

diff --git a/src/types/impl.h b/src/types/impl.h
index 22e64e76e4075cb740c8938b918c74ad601dfbe6..6a1b7417235463ac9ac0ae9ba3a20b4381e00188 100644 (file)
--- a/src/types/impl.h
+++ b/src/types/impl.h
@@ -62,4 +62,7 @@ struct psi_impl_arg *psi_impl_get_arg(struct psi_impl *impl, struct psi_impl_var
 struct psi_decl_arg *psi_impl_get_temp_let_arg(struct psi_impl *impl,
                struct psi_decl_var *var);
 
+struct psi_decl_arg *psi_impl_get_decl_arg(struct psi_impl *impl,
+               struct psi_decl_var *var);
+
 #endif

diff --git a/src/types/let_exp.c b/src/types/let_exp.c
index 38c055b6cf4e10f357c6cc7ed9a421a38a2a8cf2..d4fe6db63d556072463ac2736fed65b8b1e5c646 100644 (file)
--- a/src/types/let_exp.c
+++ b/src/types/let_exp.c
@@ -162,22 +162,23 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
 
        switch (val->kind) {
        case PSI_LET_TMP:
-               if (!psi_decl_var_validate(data, val->data.var, impl->decl, val, NULL)) {
+               if (!psi_decl_var_validate(data, val->data.var, impl, impl->decl, val, NULL)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-                                       PSI_WARNING, "Unknown variable '%s'", dvar->name);
+                                       PSI_WARNING, "Unknown variable '%s' in temp let statment of implementation '%s'",
+                                       dvar->name, impl->func->name);
                        return false;
                }
                break;
 
        default:
-               if (!psi_decl_var_validate(data, dvar, impl->decl, val, NULL)) {
+               if (!psi_decl_var_validate(data, dvar, impl, impl->decl, val, NULL)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
-                                       PSI_WARNING, "Unknown variable '%s'", dvar->name);
+                                       PSI_WARNING, "Unknown variable '%s' in let statement of implementation '%s'",
+                                       dvar->name, impl->func->name);
                        return false;
                }
                break;
        }
-
        switch (val->kind) {
        case PSI_LET_NULL:
                break;

diff --git a/src/types/let_stmt.c b/src/types/let_stmt.c
index 09844578da4d5f698d5e05f054d4c46ed8b5a64b..49c905ac365f9cdb7961d1e6dbab04c165d6402f 100644 (file)
--- a/src/types/let_stmt.c
+++ b/src/types/let_stmt.c
@@ -81,7 +81,7 @@ bool psi_let_stmts_validate(struct psi_data *data, struct psi_impl *impl)
                        return false;
                }
 
-               if (!psi_decl_get_arg(impl->decl, let_var)) {
+               if (!psi_impl_get_decl_arg(impl, let_var)) {
                        data->error(data, let_var->token, PSI_WARNING,
                                        "Unknown variable '%s' in `let` statement  of implementation '%s'",
                                        let_var->name, impl->func->name);

diff --git a/src/types/num_exp.c b/src/types/num_exp.c
index 69d21e05d7fa5489b4152a77efddeb95550df846..6dac5cef2cbd60416b5f9110fab45397c495b317 100644 (file)
--- a/src/types/num_exp.c
+++ b/src/types/num_exp.c
@@ -501,7 +501,12 @@ static inline void psi_impl_val_dump(token_t t, impl_val *res,
        case PSI_T_DOUBLE:
                if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval);
                break;
-       default:
+#if HAVE_LONG_DOUBLE
+       case PSI_T_LONG_DOUBLE:
+               if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIldval, res->ldval);
+               break;
+#endif
+               default:
                assert(0);
        }
 }

diff --git a/src/types/number.c b/src/types/number.c
index b45e00ea2fe4126890ba97ac89b07823d4c2f26f..5f44f6d0cc5bf3b4605b59538039357400bd87c2 100644 (file)
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -74,6 +74,8 @@ struct psi_number *psi_number_init(token_t t, void *num, unsigned flags)
                exp->data.ival.ldval = *(long double *) num;
                break;
 #endif
+       case PSI_T_NULL:
+               break;
        case PSI_T_QUOTED_CHAR:
        case PSI_T_NUMBER:
        case PSI_T_NSNAME:
@@ -120,6 +122,7 @@ struct psi_number *psi_number_copy(struct psi_number *exp)
 #endif
        case PSI_T_ENUM:
        case PSI_T_CONST:
+       case PSI_T_NULL:
                break;
        case PSI_T_NUMBER:
        case PSI_T_NSNAME:
@@ -166,6 +169,7 @@ void psi_number_free(struct psi_number **exp_ptr)
 #endif
                case PSI_T_ENUM:
                case PSI_T_CONST:
+               case PSI_T_NULL:
                        break;
                case PSI_T_FUNCTION:
                        psi_cpp_macro_call_free(&exp->data.call);
@@ -227,6 +231,9 @@ void psi_number_dump(int fd, struct psi_number *exp)
                dprintf(fd, "%" PRIldval, exp->data.ival.ldval);
                break;
 #endif
+       case PSI_T_NULL:
+               dprintf(fd, "NULL");
+               break;
        case PSI_T_NUMBER:
        case PSI_T_NSNAME:
        case PSI_T_DEFINE:
@@ -451,6 +458,9 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
        struct psi_decl_enum *enm;
 
        switch (exp->type) {
+       case PSI_T_NULL:
+               exp->type = PSI_T_UINT8;
+               /* no break */
        case PSI_T_CONST:
        case PSI_T_INT8:
        case PSI_T_UINT8:
@@ -481,11 +491,12 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
                if (exp->data.dvar->arg) {
                        return true;
                }
-               if (psi_decl_var_validate(data, exp->data.dvar, impl ? impl->decl : NULL,
-                               current_let, current_set)) {
+               if (psi_decl_var_validate(data, exp->data.dvar, impl,
+                               impl ? impl->decl : NULL, current_let, current_set)) {
                        return true;
                }
-               if (cb_decl && psi_decl_var_validate(data, exp->data.dvar, cb_decl, NULL, NULL)) {
+               if (cb_decl && psi_decl_var_validate(data, exp->data.dvar,
+                               NULL, cb_decl, NULL, NULL)) {
                        return true;
                }
                data->error(data, exp->token, PSI_WARNING,
@@ -559,15 +570,27 @@ static inline token_t psi_number_eval_decl_var(struct psi_number *exp,
        impl_val *ref;
        struct psi_call_frame_symbol *sym;
        struct psi_decl_type *real;
+       struct psi_decl_var *var;
        size_t size;
 
-       real = psi_decl_type_get_real(exp->data.dvar->arg->type);
-       size = psi_decl_arg_get_size(exp->data.dvar->arg);
-       sym = psi_call_frame_fetch_symbol(frame, exp->data.dvar);
-       ref = deref_impl_val(sym->ptr, exp->data.dvar);
+       var = exp->data.dvar;
+       real = psi_decl_type_get_real(var->arg->type);
+       size = psi_decl_arg_get_size(var->arg);
+       sym = psi_call_frame_fetch_symbol(frame, var);
+       ref = deref_impl_val(sym->ptr, var);
 
        memcpy(res, ref, size);
 
+       if (var->arg->var->pointer_level > var->pointer_level) {
+               switch (SIZEOF_VOID_P) {
+               case 4:
+                       return PSI_T_INT32;
+               case 8:
+                       return PSI_T_INT64;
+               default:
+                       assert(0);
+               }
+       }
        return real->type;
 }
 

diff --git a/src/types/return_exp.c b/src/types/return_exp.c
new file mode 100644 (file)
index 0000000..8718ecf
--- /dev/null
+++ b/src/types/return_exp.c
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ Copyright (c) 2017, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#include "php_psi_stdinc.h"
+#include "data.h"
+#include "call.h"
+
+struct psi_return_exp *psi_return_exp_init(struct psi_decl_var *func,
+               struct psi_plist *args, struct psi_set_exp *set)
+{
+       struct psi_return_exp *exp = calloc(1, sizeof(*exp));
+
+       exp->func = func;
+       exp->args = args;
+       exp->set = set;
+
+       return exp;
+}
+
+void psi_return_exp_free(struct psi_return_exp **exp_ptr)
+{
+       if (*exp_ptr) {
+               struct psi_return_exp *exp = *exp_ptr;
+
+               *exp_ptr = NULL;
+               if (exp->token) {
+                       psi_token_free(&exp->token);
+               }
+               if (exp->func) {
+                       psi_decl_var_free(&exp->func);
+               }
+               if (exp->args) {
+                       psi_plist_free(exp->args);
+                       exp->args = NULL;
+               }
+               if (exp->set) {
+                       psi_set_exp_free(&exp->set);
+               }
+               free(exp);
+       }
+}
+
+void psi_return_exp_dump(int fd, struct psi_return_exp *exp)
+{
+       if (exp->func) {
+               psi_decl_var_dump(fd, exp->func);
+               dprintf(fd, "(");
+               if (exp->args) {
+                       size_t i = 0;
+                       struct psi_decl_var *arg;
+
+                       while (psi_plist_get(exp->args, i++, &arg)) {
+                               if (i > 1) {
+                                       dprintf(fd, ", ");
+                               }
+                               psi_decl_var_dump(fd, arg);
+                       }
+               }
+               dprintf(fd, ")");
+       }
+       if (exp->set) {
+               if (exp->func) {
+                       dprintf(fd, " as ");
+               }
+
+               psi_set_exp_dump(fd, exp->set, 1, 1);
+       }
+}
+
+void psi_return_exp_exec(struct psi_return_exp *exp, zval *return_value,
+               struct psi_call_frame *frame)
+{
+       if (exp->set) {
+               void *rpointer = psi_call_frame_get_rpointer(frame);
+
+               psi_set_exp_exec_ex(exp->set, return_value, rpointer, frame);
+       }
+}
+
+static inline bool psi_return_exp_validate_decl_args(struct psi_data *data,
+               struct psi_return_exp *exp, struct psi_impl *impl)
+{
+       size_t i;
+       struct psi_decl_var *call_arg;
+
+       if (exp->args) {
+               if (psi_plist_count(exp->args) != psi_plist_count(impl->decl->args)) {
+                       data->error(data, exp->token, PSI_WARNING,
+                                       "Argument count of return statement of implementation '%s'"
+                                       "does not match argument count of declaration '%s'",
+                                       impl->func->name, impl->decl->func->var->name);
+                       return false;
+               }
+
+               for (i = 0; psi_plist_get(exp->args, i, &call_arg); ++i) {
+                       psi_plist_get(impl->decl->args, i, &call_arg->arg);
+               }
+       }
+       return true;
+}
+
+bool psi_return_exp_validate(struct psi_data *data, struct psi_return_exp *exp,
+               struct psi_impl *impl)
+{
+       size_t i = 0;
+       struct psi_decl *decl;
+       const char *name = psi_return_exp_get_decl_name(exp);
+
+       while (psi_plist_get(data->decls, i++, &decl)) {
+               if (!strcmp(decl->func->var->name, name)) {
+                       impl->decl = decl;
+                       return psi_return_exp_validate_decl_args(data, exp, impl) &&
+                                       psi_set_exp_validate(data, exp->set, impl, NULL);
+               }
+       }
+
+       data->error(data, exp->token, PSI_WARNING,
+                       "Missing declaration '%s' for `return` statement of implementation %s",
+                       name, impl->func->name);
+       return false;
+}
+
+const char *psi_return_exp_get_decl_name(struct psi_return_exp *exp)
+{
+       return exp->func ? exp->func->name : exp->set->data.func->var->name;
+}
+

diff --git a/src/types/return_exp.h b/src/types/return_exp.h
new file mode 100644 (file)
index 0000000..bbd1804
--- /dev/null
+++ b/src/types/return_exp.h
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ Copyright (c) 2017, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_TYPES_RETURN_EXP_H
+#define PSI_TYPES_RETURN_EXP_H
+
+struct psi_return_exp {
+       struct psi_token *token;
+       struct psi_decl_var *func;
+       struct psi_plist *args;
+       struct psi_set_exp *set;
+};
+
+struct psi_return_exp *psi_return_exp_init(struct psi_decl_var *func,
+               struct psi_plist *args, struct psi_set_exp *set);
+void psi_return_exp_free(struct psi_return_exp **exp_ptr);
+void psi_return_exp_dump(int fd, struct psi_return_exp *exp);
+void psi_return_exp_exec(struct psi_return_exp *exp, zval *return_value,
+               struct psi_call_frame *frame);
+bool psi_return_exp_validate(struct psi_data *data, struct psi_return_exp *exp,
+               struct psi_impl *impl);
+const char *psi_return_exp_get_decl_name(struct psi_return_exp *exp);
+
+#endif /* RETURN_EXP_H */

diff --git a/src/types/return_stmt.c b/src/types/return_stmt.c
index c28ba751073e0e3051b1a678af9c0a55501ba79c..123a8dfd2cdf01adc1bf4760a1931a1ae253cb46 100644 (file)
--- a/src/types/return_stmt.c
+++ b/src/types/return_stmt.c
@@ -27,19 +27,17 @@
 #include "data.h"
 #include "call.h"
 
-struct psi_return_stmt *psi_return_stmt_init(struct psi_set_exp *val)
+struct psi_return_stmt *psi_return_stmt_init(struct psi_return_exp *exp)
 {
        struct psi_return_stmt *ret = calloc(1, sizeof(*ret));
-       ret->set = val;
+       ret->exp = exp;
        return ret;
 }
 
 void psi_return_stmt_exec(struct psi_return_stmt *ret, zval *return_value,
                struct psi_call_frame *frame)
 {
-       void *rpointer = psi_call_frame_get_rpointer(frame);
-
-       psi_set_exp_exec_ex(ret->set, return_value, rpointer, frame);
+       psi_return_exp_exec(ret->exp, return_value, frame);
 }
 
 void psi_return_stmt_free(struct psi_return_stmt **ret_ptr)
@@ -51,7 +49,7 @@ void psi_return_stmt_free(struct psi_return_stmt **ret_ptr)
                if (ret->token) {
                        free(ret->token);
                }
-               psi_set_exp_free(&ret->set);
+               psi_return_exp_free(&ret->exp);
                free(ret);
        }
 }
@@ -59,14 +57,12 @@ void psi_return_stmt_free(struct psi_return_stmt **ret_ptr)
 void psi_return_stmt_dump(int fd, struct psi_return_stmt *ret)
 {
        dprintf(fd, "\treturn ");
-       psi_set_exp_dump(fd, ret->set, 1, 1);
+       psi_return_exp_dump(fd, ret->exp);
        dprintf(fd, ";\n");
 }
 
 bool psi_return_stmt_validate(struct psi_data *data, struct psi_impl *impl)
 {
-       size_t i = 0;
-       struct psi_decl *decl;
        struct psi_return_stmt *ret;
        size_t count = psi_plist_count(impl->stmts.ret);
 
@@ -92,21 +88,7 @@ bool psi_return_stmt_validate(struct psi_data *data, struct psi_impl *impl)
                break;
        }
 
-       while (psi_plist_get(data->decls, i++, &decl)) {
-               if (!strcmp(decl->func->var->name, ret->set->data.func->var->name)) {
-                       impl->decl = decl;
-                       break;
-               }
-       }
-
-       if (!impl->decl) {
-               data->error(data, ret->token, PSI_WARNING,
-                               "Missing declaration '%s' for `return` statement of implementation %s",
-                               ret->set->data.func->var->name, impl->func->name);
-               return false;
-       }
-
-       if (!psi_set_exp_validate(data, ret->set, impl, NULL)) {
+       if (!psi_return_exp_validate(data, ret->exp, impl)) {
                return false;
        }
 

diff --git a/src/types/return_stmt.h b/src/types/return_stmt.h
index db4820ca3f27fcd4d9735d40f7b0b32bbea55c43..ae05b3adba9c76c699eab245a27eb81e96f22a29 100644 (file)
--- a/src/types/return_stmt.h
+++ b/src/types/return_stmt.h
@@ -36,10 +36,10 @@ struct psi_set_exp;
 
 struct psi_return_stmt {
        struct psi_token *token;
-       struct psi_set_exp *set;
+       struct psi_return_exp *exp;
 };
 
-struct psi_return_stmt *psi_return_stmt_init(struct psi_set_exp *val);
+struct psi_return_stmt *psi_return_stmt_init(struct psi_return_exp *exp);
 void psi_return_stmt_free(struct psi_return_stmt **ret_ptr);
 void psi_return_stmt_dump(int fd, struct psi_return_stmt *ret);
 void psi_return_stmt_exec(struct psi_return_stmt *ret, zval *return_value, struct psi_call_frame *frame);

diff --git a/src/types/set_func.c b/src/types/set_func.c
index 7e56637e325ab47278adc3bf16c3e7798bfbaaec..21189bff33668f8b35e4ec32ab5d7ec2e74bbdc7 100644 (file)
--- a/src/types/set_func.c
+++ b/src/types/set_func.c
@@ -204,8 +204,8 @@ static inline bool psi_set_func_validate_to_recursive(struct psi_data *data,
 bool psi_set_func_validate(struct psi_data *data, struct psi_set_func *func,
                struct psi_set_exp *set, struct psi_impl *impl, struct psi_decl *cb_decl)
 {
-       if (!psi_decl_var_validate(data, func->var, impl->decl, NULL, set)
-                       && !psi_decl_var_validate(data, func->var, cb_decl, NULL, NULL)
+       if (!psi_decl_var_validate(data, func->var, NULL, impl->decl, NULL, set)
+                       && !psi_decl_var_validate(data, func->var, NULL, cb_decl, NULL, NULL)
                        && !psi_impl_get_temp_let_arg(impl, func->var)) {
                data->error(data, func->var->token, PSI_WARNING,
                                "Unknown variable '%s' in implementation %s",

diff --git a/tests/pipe/pipe.psi b/tests/pipe/pipe.psi
index d1961da8afc4b5bbf8d480405ea826c1fc21d558..c7b2e73347d1a9760c28261bb961bff5a52058f6 100644 (file)
--- a/tests/pipe/pipe.psi
+++ b/tests/pipe/pipe.psi
@@ -2,7 +2,7 @@
 // extern int pipe(int fildes[2]);
 
 function \pipe(array &$fds = null) : int {
-       return to_int(pipe);
+       return pipe(fildes) as to_int(pipe);
        let fildes = calloc(2, psi\SIZEOF_INT);
        set $fds = to_array(*fildes, 2, to_int(*fildes));
 }

diff --git a/tests/stat/stat001.phpt b/tests/stat/stat001.phpt
index 9051123c802e0510341917446d886f727432b25c..ee390618e2f2fe8a5aca1491d27888d769a77014 100644 (file)
--- a/tests/stat/stat001.phpt
+++ b/tests/stat/stat001.phpt
@@ -16,7 +16,7 @@ var_dump(psi\stat(__FILE__, $stat), $stat);
 --EXPECTF--
 ===TEST===
 int(0)
-array(16) {
+array(13) {
   ["st_dev"]=>
   int(%d)
   ["st_ino"]=>
@@ -40,8 +40,6 @@ array(16) {
     ["tv_nsec"]=>
     int(%d)
   }
-  ["st_atime"]=>
-  int(%d)
   ["st_mtim"]=>
   array(2) {
     ["tv_sec"]=>
@@ -49,8 +47,6 @@ array(16) {
     ["tv_nsec"]=>
     int(%d)
   }
-  ["st_mtime"]=>
-  int(%d)
   ["st_ctim"]=>
   array(2) {
     ["tv_sec"]=>
@@ -58,8 +54,6 @@ array(16) {
     ["tv_nsec"]=>
     int(%d)
   }
-  ["st_ctime"]=>
-  int(%d)
   ["st_blksize"]=>
   int(%d)
   ["st_blocks"]=>