From 3bbe509d54a873810e3693a768e56fd57f9e1d1c Mon Sep 17 00:00:00 2001
From: shrlnm <mshkn@inbox.ru>
Date: Sun, 22 Dec 2019 09:43:40 +0300
Subject: [PATCH] 9q fix#17 ply name and hex ambiguity

---
 pyren/mod_ddt_screen.py | 14 +++++++++++++-
 pyren/mod_ply.py        |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pyren/mod_ddt_screen.py b/pyren/mod_ddt_screen.py
index d25b9cf..dd45f68 100755
--- a/pyren/mod_ddt_screen.py
+++ b/pyren/mod_ddt_screen.py
@@ -865,7 +865,19 @@ class DDTScreen (tk.Frame):
             r = str (self.decu.requests[self.decu.req4data[closest]])
 
         
-        xText = d + '\n' + '*' * 50 + '\n' + r + '\n' + '*' * 50 + '\n' + p
+        try:
+            xText = d + '\n' + '*' * 50 + '\n'
+        except:
+            pass
+        try:
+            xText += r + '\n' + '*' * 50 + '\n'
+        except:
+            pass
+        try:
+            xText += p
+        except:
+            pass
+
         dialog = InfoDialog (self.root, xText)
         self.root.wait_window (dialog.top)
     
diff --git a/pyren/mod_ply.py b/pyren/mod_ply.py
index 8cad99e..b6cc709 100755
--- a/pyren/mod_ply.py
+++ b/pyren/mod_ply.py
@@ -8,6 +8,7 @@ import ply.lex as lex
 import ply.yacc as yacc
 import os
 import time
+import re
 
 
 class Parser:
@@ -345,7 +346,10 @@ class Calc(Parser):
             p[0] = self.names[p[1]]
         except LookupError:
             print "PLY:Parser:Undefined name '%s'" % p[1]
-            p[0] = 0
+            if re.match('^[a-fA-F0-9]*$',p[1]) != None:
+                p[0] = p[1]
+            else:
+                p[0] = 0
     p_expression_name.func_doc='expression : NAME'
         
     def p_error(self, p):