From 8c4eef4f43762a41330b71f370c0bd2a884231fe Mon Sep 17 00:00:00 2001
From: Mauricio Caceres <mauricio.caceres.bravo@gmail.com>
Date: Tue, 10 May 2016 22:51:15 -0400
Subject: Removed redundant string interpolation in lexer definitions.

---
 pygments/lexers/sas.py   | 2 --
 pygments/lexers/stata.py | 7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pygments/lexers/sas.py b/pygments/lexers/sas.py
index 55749ebe..b7f4eb54 100644
--- a/pygments/lexers/sas.py
+++ b/pygments/lexers/sas.py
@@ -195,7 +195,6 @@ class SASLexer(RegexLexer):
             (r'\\\\|\\"|\\\n', String.Escape),
             # AFAIK, macro variables are not evaluated in single quotes
             # (r'&', Name.Variable, 'validvar'),
-            # (r'&', String.Interpol, 'validvar'),
             (r'[^$\'\\]+', String),
             (r'[$\'\\]', String),
         ],
@@ -203,7 +202,6 @@ class SASLexer(RegexLexer):
             (r'"', String, '#pop'),
             (r'\\\\|\\"|\\\n', String.Escape),
             (r'&', Name.Variable, 'validvar'),
-            (r'&', String.Interpol, 'validvar'),
             (r'[^$&"\\]+', String),
             (r'[$"\\]', String),
         ],
diff --git a/pygments/lexers/stata.py b/pygments/lexers/stata.py
index 98ee56f2..158aaff7 100644
--- a/pygments/lexers/stata.py
+++ b/pygments/lexers/stata.py
@@ -455,8 +455,6 @@ class StataLexer(RegexLexer):
             (r'\\\\|\\"|\\\n', String.Escape),
             (r'\$', Name.Variable.Global, 'var_validglobal'),
             (r'`', Name.Variable, 'var_validlocal'),
-            (r'\$', String.Interpol, 'var_validglobal'),
-            (r'`', String.Interpol, 'var_validlocal'),
             (r'[^$\$`"\\]+', String),
             (r'[$"\\]', String),
         ],
@@ -465,8 +463,6 @@ class StataLexer(RegexLexer):
             (r'\\\\|\\"|\\\n', String.Escape),
             (r'\$', Name.Variable.Global, 'var_validglobal'),
             (r'`', Name.Variable, 'var_validlocal'),
-            (r'\$', String.Interpol, 'var_validglobal'),
-            (r'`', String.Interpol, 'var_validlocal'),
             (r'[^$\$`"\\]+', String),
             (r'[$"\\]', String),
         ],
@@ -487,7 +483,8 @@ class StataLexer(RegexLexer):
         'keywords': [
             (words(builtins_functions, prefix = r'\b', suffix = r'\('),
              Name.Function),
-            (words(builtins_base, prefix = r'\b', suffix = r'\b'), Keyword),
+            (words(builtins_base, prefix = r'(^\s*|\s)', suffix = r'\b'),
+             Keyword),
         ],
         # http://www.stata.com/help.cgi?operators
         # 'operators': [
-- 
cgit v1.2.1