From: ken <ken@mihrtec.com>
Date: Sat, 14 Jan 2017 21:32:52 +0000 (-0800)
Subject: merged
X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=commitdiff_plain;h=c2939528b3dc3a9b9b125d06d8109919027a5ff4;hp=-c

merged
---

c2939528b3dc3a9b9b125d06d8109919027a5ff4
diff --combined src/lexer.rl
index 23bbf32,9b4dc41..f7dafa2
--- a/src/lexer.rl
+++ b/src/lexer.rl
@@@ -11,7 -11,6 +11,7 @@@ void lexer_pushtok(int, YYSTYPE)
  /* Public */
  int lexer_setdirection(uint8_t*, int);
  int lexer_lexfile(const uint8_t*);
 +int lexer_lexdir(const uint8_t*);
  int lexer_lexstring(const uint8_t*, int);
  int lexer_setstr(uint8_t*, int);
  //apc.c
@@@ -116,7 -115,7 +116,7 @@@ yycstate* apc_cstate
    SS = ('+SS' %to(push_SS)) | ('+SS' %to(push_SS) link ) ;
    ref = '0x' >set_ts alnum{8} $err(ref_error) %push_ref ;
    val = digit+ >set_ts %push_val ;
-   name = (lower+ >set_ts) (lower | digit)+  %push_name ;
+   name = lower >set_ts (lower | digit)*  %push_name ;
    map = '+MAP' %to(push_map);
    tok = (name | val | ref | dimensions | map | link | SS | direction);
    
@@@ -172,13 -171,6 +172,13 @@@ int lexer_lexfil
    return en_main == 1;
  }
  
 +int lexer_lexdir
 +( uint8_t const* dirname )
 +{ uint8_t const* de = dirname;
 +  while (*de++);
 +  return lexer_lexstring(dirname, (int)(de - dirname));
 +}
 +
  /**************************/
  /****Abandon All Hope******/
  /**************************/