X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=03484a89b116aeeee4d9169547c597bc097b4363;hp=5851ee68b74e31a62f8f820108b06e24fe812b5d;hb=410881ab37d993b0a15d295293a005aa0500ce8d;hpb=5359ad5c181e5772f350fe1cba060cbed3a05b91

diff --git a/src/parser.h b/src/parser.h
index 5851ee6..03484a8 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -1,12 +1,32 @@
-#ifndef _PSI_PARSER_H
-#define _PSI_PARSER_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
+ 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 "parser_proc.h"
+#ifndef PSI_PARSER_H
+#define PSI_PARSER_H
+
+#include <stdarg.h>
 
 #define BSIZE 256
 
@@ -16,19 +36,38 @@
 
 struct psi_parser {
 	PSI_DATA_MEMBERS;
-	FILE *fp;
 	token_t num;
-	void *proc;
 	unsigned line, col;
-	char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
-};
+	char *cur, *tok, *lim, *eof, *ctx, *mrk;
+
+	/* internals */
+	void *proc;
 
-#define PSI_PARSER_DEBUG 0x1
-#define PSI_PARSER_SILENT 0x2
+	struct {
+		enum psi_parser_input_type {
+			PSI_PARSE_FILE = 1,
+			PSI_PARSE_STRING
+		} type;
+
+		union {
+			struct {
+				FILE *handle;
+				char *buffer;
+#if HAVE_MMAP
+				size_t length;
+#endif
+			} file;
+			struct {
+				char *buffer;
+				size_t length;
+			} string;
+		} data;
+	} input;
+};
 
-struct psi_parser *psi_parser_init(struct psi_parser *P, const char *filename, psi_error_cb error, unsigned flags);
-void psi_parser_syntax_error(struct psi_parser *P, const char *fn, size_t ln, const char *msg, ...);
-size_t psi_parser_fill(struct psi_parser *P, size_t n);
+struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags);
+bool psi_parser_open_file(struct psi_parser *P, const char *filename);
+bool psi_parser_open_string(struct psi_parser *P, const char *string, size_t length);
 token_t psi_parser_scan(struct psi_parser *P);
 void psi_parser_parse(struct psi_parser *P, struct psi_token *src);
 void psi_parser_dtor(struct psi_parser *P);