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

merged
---

4c97482a33d6066134b35d26bf6808476950d728
diff --combined src/lexer.rl
index f7dafa2,9847687..553ff3d
--- 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
@@@ -121,7 -120,7 +121,7 @@@ yycstate* apc_cstate
    tok = (name | val | ref | dimensions | map | link | SS | direction);
    
  
-   main := (tok tok_delimiter)+ tok [\0];
+   main := (tok tok_delimiter)* tok [\0];
  
    write data nofinal noerror noprefix;
    
@@@ -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******/
  /**************************/