From 348ff620fa1acb807b83b173ee62807df21510e5 Mon Sep 17 00:00:00 2001
From: Victor Uriarte <victor.m.uriarte@intel.com>
Date: Fri, 3 Jun 2016 09:55:41 -0700
Subject: Simplify multi-line comments

---
 sqlparse/keywords.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'sqlparse/keywords.py')

diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index c6db0a9..41edbff 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -19,9 +19,11 @@ SQL_REGEX = {
         # $ matches *before* newline, therefore we have two patterns
         # to match Comment.Single
         (r'(--|# ).*?$', tokens.Comment.Single),
+        (r'/\*[\s\S]*?\*/', tokens.Comment.Multiline),
+
         (r'(\r\n|\r|\n)', tokens.Newline),
         (r'\s+', tokens.Whitespace),
-        (r'/\*', tokens.Comment.Multiline, 'multiline-comments'),
+
         (r':=', tokens.Assignment),
         (r'::', tokens.Punctuation),
         (r'[*]', tokens.Wildcard),
@@ -64,12 +66,6 @@ SQL_REGEX = {
         (r'[;:()\[\],\.]', tokens.Punctuation),
         (r'[<>=~!]+', tokens.Operator.Comparison),
         (r'[+/@#%^&|`?^-]+', tokens.Operator),
-    ],
-    'multiline-comments': [
-        (r'/\*', tokens.Comment.Multiline, 'multiline-comments'),
-        (r'\*/', tokens.Comment.Multiline, '#pop'),
-        (r'[^/\*]+', tokens.Comment.Multiline),
-        (r'[/*]', tokens.Comment.Multiline),
     ]}
 
 KEYWORDS = {
@@ -600,7 +596,6 @@ KEYWORDS = {
     'VARYING': tokens.Name.Builtin,
 }
 
-
 KEYWORDS_COMMON = {
     'SELECT': tokens.Keyword.DML,
     'INSERT': tokens.Keyword.DML,
-- 
cgit v1.2.1