parser: regenerate with file header

[m6w6/ext-psi] / src / parser.re

diff --git a/src/parser.re b/src/parser.re
index 7ed66288285728324a2757bc8d4c33de2b4e578e..fb460803bf37af692f85bdbaa5180bfdfcc573be 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -1,13 +1,38 @@
+/*******************************************************************************
+ Copyright (c) 2016, 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 <sys/mman.h>
 #include <assert.h>
 
 #include "parser.h"
 
-void *psi_parser_proc_Alloc(void*(unsigned long));
-void psi_parser_proc_Free(void*, void(*)(void*));
-void psi_parser_proc_(void *, token_t, struct psi_token *, struct psi_parser *);
-void psi_parser_proc_Trace(FILE *, const char*);
+void *psi_parser_proc_init(void);
+void psi_parser_proc_free(void **parser_proc);
+void psi_parser_proc_parse(void *parser_proc, token_t r, struct psi_token *token, struct psi_parser *parser);
+void psi_parser_proc_trace(FILE *out, char *prefix);
 
 struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags)
 {
@@ -20,10 +45,10 @@ struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, uns
 
        P->col = 1;
        P->line = 1;
-       P->proc = psi_parser_proc_Alloc(malloc);
+       P->proc = psi_parser_proc_init();
 
        if (flags & PSI_DEBUG) {
-               psi_parser_proc_Trace(stderr, "PSI> ");
+               psi_parser_proc_trace(stderr, "PSI> ");
        }
 
        return P;
@@ -152,15 +177,15 @@ static ssize_t psi_parser_fill(struct psi_parser *P, size_t n)
 void psi_parser_parse(struct psi_parser *P, struct psi_token *T)
 {
        if (T) {
-               psi_parser_proc_(P->proc, T->type, T, P);
+               psi_parser_proc_parse(P->proc, T->type, T, P);
        } else {
-               psi_parser_proc_(P->proc, 0, NULL, P);
+               psi_parser_proc_parse(P->proc, 0, NULL, P);
        }
 }
 
 void psi_parser_dtor(struct psi_parser *P)
 {
-       psi_parser_proc_Free(P->proc, free);
+       psi_parser_proc_free(&P->proc);
 
        switch (P->input.type) {
        case PSI_PARSE_FILE:
@@ -255,6 +280,10 @@ token_t psi_parser_scan(struct psi_parser *P)
                "}" {RETURN(PSI_T_RBRACE);}
                "[" {RETURN(PSI_T_LBRACKET);}
                "]" {RETURN(PSI_T_RBRACKET);}
+               "!=" {RETURN(PSI_T_CMP_NE);}
+               "==" {RETURN(PSI_T_CMP_EQ);}
+               "&&" {RETURN(PSI_T_AND);}
+               "||" {RETURN(PSI_T_OR);}
                "=" {RETURN(PSI_T_EQUALS);}
                "*" {RETURN(PSI_T_ASTERISK);}
                "~" {RETURN(PSI_T_TILDE);}
@@ -268,6 +297,10 @@ token_t psi_parser_scan(struct psi_parser *P)
                "^" {RETURN(PSI_T_CARET);}
                "<<" {RETURN(PSI_T_LSHIFT);}
                ">>" {RETURN(PSI_T_RSHIFT);}
+               "<=" {RETURN(PSI_T_CMP_LE);}
+               ">=" {RETURN(PSI_T_CMP_GE);}
+               "<" {RETURN(PSI_T_LCHEVR);}
+               ">" {RETURN(PSI_T_RCHEVR);}
                "..." {RETURN(PSI_T_ELLIPSIS);}
                [\r\n] { NEWLINE(nextline); }
                [\t ]+ { continue; }
@@ -308,6 +341,8 @@ token_t psi_parser_scan(struct psi_parser *P)
                'LIB' {RETURN(PSI_T_LIB);}
                'LET' {RETURN(PSI_T_LET);}
                'SET' {RETURN(PSI_T_SET);}
+               'PRE_ASSERT' {RETURN(PSI_T_PRE_ASSERT);}
+               'POST_ASSERT' {RETURN(PSI_T_POST_ASSERT);}
                'RETURN' {RETURN(PSI_T_RETURN);}
                'FREE' {RETURN(PSI_T_FREE);}
                'TEMP' {RETURN(PSI_T_TEMP);}