oslc didn't understand hex integer constants (like 0x01fc). #653

Author: lgritz

CHANGES.md

@@ -13,6 +13,8 @@ Language, standard libary, and compiler changes (for shader writers):
      nested `{ {...}, {...} }`.  #640 (1.8.0)
    * oslc (and liboslcomp) now supports UTF-8 filenames, including on
      Windows. #643 (1.8.0)
+   * osl now accepts hexidecimal integer constants (such as `0x01ff`).
+     #653 (1.8.1)
 * Standard library additions/changes:
 
 API changes, new options, new ShadingSystem features (for renderer writers):

CMakeLists.txt

@@ -538,7 +538,8 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
             function-earlyreturn function-simple function-outputelem
             geomath getattribute-camera getsymbol-nonheap gettextureinfo
             group-outputs groupstring
-            hyperb ieee_fp if incdec initops intbits isconnected isconstant
+            hex hyperb
+            ieee_fp if incdec initops intbits isconnected isconstant
             layers layers-Ciassign layers-entry layers-lazy
             layers-nonlazycopy layers-repeatedoutputs
             linearstep

src/doc/languagespec.tex

@@ -62,7 +62,7 @@
 \emph{[email protected]}
 }
 \date{{\large Date: 14 Jan, 2016 \\
- (with corrections, 14 Jun 2016)
+ (with corrections, 5 Jul 2016)
 }
 \bigskip
 \bigskip
@@ -1464,7 +1464,8 @@ \section{{\cf int}}
 least 32 bits.
 
 Integer constants are constructed the same way as in C.  The following
-are examples of {\cf int} constants: {\cf 1}, {\cf -32}, etc.
+are examples of {\cf int} constants: {\cf 1}, {\cf -32}, etc. Integer
+constants may be specified as hexidecimal, for example: {\cf 0x01cf}.
 
 Unlike C, no unsigned, bool, char, short, or long types are supplied.
 This is to simplify the process of writing shaders (as well as
@@ -5089,7 +5090,12 @@ \section*{Lexical elements}
 
 <digit-sequence> ::= <digit> \{ <digit> \}
 
+<hexdigit> ::= <digit> | "a" | "A" | "b" | "B" | "c" | "C" | "d" | "D" | "e" | "E" | "f" | "F"
+
+<hexdigit-sequence> ::= <hexdigit> \{ <hexdigit> \}
+
 <integer> ::= <sign> <digit-sequence>
+\alt <sign> "0x" <hexdigit-sequence>
 
 <floating-point> ::= <digit-sequence> <decimal-part-opt> <exponent-opt>
 \alt <decimal-part> <exponent-opt>

src/liboslcomp/osllex.l

@@ -64,6 +64,7 @@ ALPHA           [A-Za-z]
 DIGIT           [0-9]
  /* Integer literal */
 INTEGER         {DIGIT}+
+HEXINTEGER      0[xX][0-9a-fA-F]+
  /* floating point literal (E, FLT1, FLT2, FLT3 are just helpers)
   * NB: we don't allow leading +/- due to ambiguity between
   * whether "a-0.5" is really "a -0.5" or "a - 0.5".  Resolve this
@@ -204,6 +205,22 @@ void preprocess (const char *yytext);
                             SETLINE;
                             return INT_LITERAL;
                         }
+{HEXINTEGER}            {
+                            long long llval = strtoll (yytext, (char**)NULL, 16);
+                            // we do not detect overflow when the value is INT_MAX+1,
+                            // because negation happens later and -(INT_MAX+1) == INT_MIN
+                            if (llval > ((long long)UINT_MAX)+1) {
+                                oslcompiler->error (oslcompiler->filename(),
+                                                    oslcompiler->lineno(),
+                                                    "integer overflow, value must be between %d and %d.",
+                                                    INT_MIN, INT_MAX);
+                            }
+                            yylval.i = (int)llval;
+                            SETLINE;
+                            return INT_LITERAL;
+                        }
+
+
 
 {FLT}                   {
                             yylval.f = atof (yytext);

testsuite/hex/ref/out.txt

@@ -0,0 +1,3 @@
+Compiled test.osl -> test.oso
+a = 26 (hex 1a), b = -1 (hex ffffffff)
+

testsuite/hex/run.py

@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+
+command = testshade("test")

testsuite/hex/test.osl

@@ -0,0 +1,7 @@
+shader
+test ()
+{
+    int a = 0x001a;
+    int b = 0xffffffff;
+    printf ("a = %d (hex %x), b = %d (hex %x)\n", a, a, b, b);
+}