ragelmaker(src/parser/Parser.rl)
+set_source_files_properties(
+ ${CMAKE_BINARY_DIR}/src/parser/control_verbs.cpp
+ PROPERTIES
+ COMPILE_FLAGS "${RAGEL_C_FLAGS}")
+
+ragelmaker(src/parser/control_verbs.rl)
+
SET(hs_HEADERS
src/hs.h
src/hs_common.h
src/parser/buildstate.h
src/parser/check_refs.cpp
src/parser/check_refs.h
+ src/parser/control_verbs.cpp
+ src/parser/control_verbs.h
src/parser/parse_error.cpp
src/parser/parse_error.h
src/parser/parser_util.cpp
/*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* This call will throw a ParseError on failure.
*/
-std::unique_ptr<Component> parse(const char *const ptr, ParseMode &mode);
+std::unique_ptr<Component> parse(const char *ptr, ParseMode &mode);
} // namespace ue2
/*
- * Copyright (c) 2015-2016, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
/* Parser.cpp is a built source, may not be in same dir as parser files */
#include "parser/check_refs.h"
+#include "parser/control_verbs.h"
#include "parser/ComponentAlternation.h"
#include "parser/ComponentAssertion.h"
#include "parser/ComponentAtomicGroup.h"
#############################################################
readVerb := |*
'UTF8)' => {
- if (ts != ptr + 2) {
- throw LocatedParseError("(*UTF8) must be at start of "
- "expression, encountered");
- }
- mode.utf8 = true;
- globalMode.utf8 = true; /* once you unicode, you can't stop */
- ucp_start_p = te; /* (*UCP) can appear after us */
- fret;
+ throw LocatedParseError("(*UTF8) must be at start of "
+ "expression, encountered");
+ };
+ 'UTF)' => {
+ throw LocatedParseError("(*UTF) must be at start of "
+ "expression, encountered");
};
'UCP)' => {
- if (ts != ucp_start_p + 2) {
- throw LocatedParseError("(*UCP) must be at start of "
- "expression, encountered");
- }
- mode.ucp = true;
- globalMode.ucp = true; /* once you unicode, you can't stop */
- fret;
+ throw LocatedParseError("(*UCP) must be at start of "
+ "expression, encountered");
};
'UTF16)' => {
throw LocatedParseError("(*UTF16) not supported");
};
+ 'UTF32)' => {
+ throw LocatedParseError("(*UTF32) not supported");
+ };
any => {
throw LocatedParseError("Unknown control verb");
};
%% write data nofinal;
/** \brief Main parser call, returns root Component or nullptr. */
-unique_ptr<Component> parse(const char *const c_ptr, ParseMode &globalMode) {
- const u8 * const ptr = (const u8 * const)c_ptr;
+unique_ptr<Component> parse(const char *c_ptr, ParseMode &globalMode) {
+ assert(c_ptr);
+
+ const u8 *ptr = (const u8 *const)c_ptr;
const u8 *p = ptr;
const u8 *pe = ptr + strlen(c_ptr);
+
+ // First, read the control verbs, set any global mode flags and move the
+ // ptr forward.
+ p = (const u8 *)read_control_verbs((const char *)p, (const char *)pe,
+ globalMode);
+
const u8 *eof = pe;
int cs;
UNUSED int act;
// Location at which the current character class began.
const u8 *currentClsBegin = p;
- const u8 *ucp_start_p = p; /* for (*UCP) verb */
-
// We throw exceptions on various parsing failures beyond this point: we
// use a try/catch block here to clean up our allocated memory before we
// re-throw the exception to the caller.
--- /dev/null
+/*
+ * Copyright (c) 2017, Intel Corporation
+ *
+ * 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.
+ * * Neither the name of Intel Corporation nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * 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.
+ */
+
+/**
+ * \file
+ * \brief Parser for control verbs that can occur at the beginning of a pattern.
+ */
+
+#ifndef CONTROL_VERBS_H
+#define CONTROL_VERBS_H
+
+namespace ue2 {
+
+struct ParseMode;
+
+const char *read_control_verbs(const char *ptr, const char *end,
+ ParseMode &mode);
+
+} // namespace ue2
+
+#endif // CONTROL_VERBS_H
--- /dev/null
+/*
+ * Copyright (c) 2017, Intel Corporation
+ *
+ * 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.
+ * * Neither the name of Intel Corporation nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * 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.
+ */
+
+/**
+ * \file
+ * \brief Parser for control verbs that can occur at the beginning of a pattern.
+ */
+
+#include "parser/control_verbs.h"
+
+#include "parser/Parser.h"
+#include "parser/parse_error.h"
+
+#include <cstring>
+#include <sstream>
+
+using namespace std;
+
+namespace ue2 {
+
+const char *read_control_verbs(const char *ptr, const char *end,
+ ParseMode &mode) {
+ const char *p = ptr;
+ const char *pe = end;
+ const char *eof = pe;
+ const char *ts, *te;
+ int cs;
+ UNUSED int act;
+
+ %%{
+ machine ControlVerbs;
+
+ # Verbs that we recognise but do not support.
+ unhandledVerbs = '(*' (
+ 'LIMIT_MATCH=' [0-9]+ |
+ 'LIMIT_RECURSION=' [0-9]+ |
+ 'NO_AUTO_POSSESS' |
+ 'NO_START_OPT' |
+ 'UTF16' |
+ 'UTF32' |
+ 'CR' |
+ 'LF' |
+ 'CRLF' |
+ 'ANYCRLF' |
+ 'ANY' |
+ 'BSR_ANYCRLF' |
+ 'BSR_UNICODE'
+ ) . ')';
+
+ main := |*
+ '(*UTF8)' | '(*UTF)' => {
+ mode.utf8 = true;
+ };
+
+ '(*UCP)' => {
+ mode.ucp = true;
+ };
+
+ unhandledVerbs => {
+ ostringstream str;
+ str << "Unsupported control verb " << string(ts, te - ts);
+ throw LocatedParseError(str.str());
+ };
+
+ '(*' [^)]+ ')' => {
+ ostringstream str;
+ str << "Unknown control verb " << string(ts, te - ts);
+ throw LocatedParseError(str.str());
+ };
+
+ # Anything else means we're done.
+ any => {
+ fhold;
+ fbreak;
+ };
+ *|;
+
+ write data;
+ write init;
+ }%%
+
+ try {
+ %% write exec;
+ } catch (LocatedParseError &error) {
+ if (ts >= ptr && ts <= pe) {
+ error.locate(ts - ptr);
+ } else {
+ error.locate(0);
+ }
+ throw;
+ }
+
+ return p;
+}
+
+} // namespace ue2
91:/a\owibble/ #Value in \o{...} sequence is non-octal or missing braces at index 1.
92:/a\o{wibble/ #Value in \o{...} sequence is non-octal or missing braces at index 1.
93:/a\o{777}/ #Value in \o{...} sequence is too large at index 1.
-94:/(*UTF16)foo/ #(*UTF16) not supported at index 2.
-95:/(*BSR_UNICODE)abc/ #Unknown control verb at index 2.
+94:/(*UTF16)foo/ #Unsupported control verb (*UTF16) at index 0.
+95:/(*BSR_UNICODE)abc/ #Unsupported control verb (*BSR_UNICODE) at index 0.
96:/a+(*SKIP)b/ #Unknown control verb at index 4.
97:/foo(*/ #Invalid repeat at index 4.
98:/[:\]:]/ #POSIX named classes are only supported inside a class at index 0.
133:/[a[.\].]]/ #Unsupported POSIX collating element at index 2.
134:/[a[=\]=]]/ #Unsupported POSIX collating element at index 2.
135:/[^\D\d]/8W #Pattern can never match.
+136:/(*LIMIT_MATCH=1000)foobar/ #Unsupported control verb (*LIMIT_MATCH=1000) at index 0.
+137:/(*UTF32)foobar/ #Unsupported control verb (*UTF32) at index 0.
+138:/(*UNKNOWNVERB)foobar/ #Unknown control verb (*UNKNOWNVERB) at index 0.
+139:/foo(*UTF8)bar/ #(*UTF8) must be at start of expression, encountered at index 5.
+140:/(?i)(*UTF8)foobar/ #(*UTF8) must be at start of expression, encountered at index 6.
projects / thirdparty / vectorscan.git / commitdiff
