summaryrefslogtreecommitdiff
path: root/asm/tokens.dat
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-14 00:50:34 -0800
committerH. Peter Anvin (Intel) <hpa@zytor.com>2018-12-14 00:57:05 -0800
commit9df075595e08b923c1eb9d73b2900ed4a0dfb464 (patch)
tree20af360d010eb3a6cf8a6bbdad095bdba53434a0 /asm/tokens.dat
parentce19a52a3422332d55d8c0f601f30c2e67c14f09 (diff)
downloadnasm-9df075595e08b923c1eb9d73b2900ed4a0dfb464.tar.gz
Restore the ability to have ? in identifiers, except ? itself
? in identifiers turns out to be used in the field even in non-TASM mode. Resolve this by allowing it in an identifier still, but treat '?' by itself the same as we would a keyword, meaning that it needs to be separated from other identifier characters. In other words: a ? b : c ; conditional expression a?b:c ; seg:off expression seg = a?b, off = c Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'asm/tokens.dat')
-rw-r--r--asm/tokens.dat3
1 files changed, 3 insertions, 0 deletions
diff --git a/asm/tokens.dat b/asm/tokens.dat
index 528f2431..d5345e19 100644
--- a/asm/tokens.dat
+++ b/asm/tokens.dat
@@ -35,6 +35,9 @@
# Tokens other than instructions and registers
#
+% TOKEN_QMARK, 0, 0, 0
+?
+
% TOKEN_PREFIX, 0, 0, P_*
a16
a32