Getting closer...

4 files changed, 10 insertions, 7 deletions

diff --git a/lib/bb/parse/parse_c/bitbakeparser.l b/lib/bb/parse/parse_c/bitbakeparser.l
index 73d8c4001..ee4ce1483 100644
--- a/lib/bb/parse/parse_c/bitbakeparser.l
+++ b/lib/bb/parse/parse_c/bitbakeparser.l
@@ -95,11 +95,8 @@ enum {
 #define YY_EXTRA_TYPE lex_t*
 
 	/* Read from buffer */
-#define YY_INPUT(rgb,result,cbMax) \
- { if (cbMax > yyextra->cbInput) cbMax = yyextra->cbInput; \
-   memcpy (rgb, yyextra->rgbInput, cbMax); \
-   yyextra->cbInput -= cbMax; yyextra->rgbInput += cbMax; \
-   result = cbMax ? cbMax : YY_NULL; }
+#define YY_INPUT(buf,result,max_size) \
+ { yyextra->input(buf, &result, max_size); }
 
 //#define YY_DECL static size_t yylex ()
 
diff --git a/lib/bb/parse/parse_c/bitbakeparser.py b/lib/bb/parse/parse_c/bitbakeparser.py
index cd60cac27..ed7b13eef 100644
--- a/lib/bb/parse/parse_c/bitbakeparser.py
+++ b/lib/bb/parse/parse_c/bitbakeparser.py
@@ -29,7 +29,7 @@ class CParser:
     """
     The C-based Parser for Bitbake
     """
-    def __init__(self, data):
+    def __init__(self, data, type):
         """
         Constructor
         """
@@ -56,6 +56,11 @@ class CParser:
         """
         pass
 
+    def _assign(self, key, value):
+        """
+        """
+        pass
+
     def _append(self, key, value):
         """
         VAR += "MOO"
diff --git a/lib/bb/parse/parse_c/bitbakeparser.y b/lib/bb/parse/parse_c/bitbakeparser.y
index c6ae71125..4bc81a913 100644
--- a/lib/bb/parse/parse_c/bitbakeparser.y
+++ b/lib/bb/parse/parse_c/bitbakeparser.y
@@ -41,7 +41,7 @@
 %extra_argument  {lex_t* lex}
 
 %include {
-#include "standard.h"
+#include "token.h"
 }
 
 
diff --git a/lib/bb/parse/parse_c/lexer.h b/lib/bb/parse/parse_c/lexer.h
index 74f6295f3..1edf72dcf 100644
--- a/lib/bb/parse/parse_c/lexer.h
+++ b/lib/bb/parse/parse_c/lexer.h
@@ -30,6 +30,7 @@ struct lex_t {
     void* (*parse)(void*, int, token_t, lex_t*);
 
     void accept(int token, const char* string = 0);
+    void input(char *buf, int *result, int_max_size);
     int  line()const;
     const char* filename()const;
 private: