1 files changed, 18 insertions, 4 deletions

diff --git a/lobject.h b/lobject.h
index 342197c4..c6c43647 100644
--- a/lobject.h
+++ b/lobject.h
@@ -394,7 +394,7 @@ typedef struct TString {
     size_t lnglen;  /* length for long strings */
     struct TString *hnext;  /* linked list for hash table */
   } u;
-  char contents[1];
+  char contents[1];  /* string body starts here */
 } TString;
 
 
@@ -403,15 +403,22 @@ typedef struct TString {
 ** Get the actual string (array of bytes) from a 'TString'. (Generic
 ** version and specialized versions for long and short strings.)
 */
-#define getstr(ts)      ((ts)->contents)
 #define getlngstr(ts)   check_exp((ts)->shrlen == 0xFF, (ts)->contents)
 #define getshrstr(ts)   check_exp((ts)->shrlen != 0xFF, (ts)->contents)
+#define getstr(ts)      ((ts)->contents)
 
 
 /* get string length from 'TString *s' */
 #define tsslen(s)  \
         ((s)->shrlen != 0xFF ? (s)->shrlen : (s)->u.lnglen)
 
+/*
+** Get string and length */
+#define getlstr(ts, len)  \
+        ((ts)->shrlen != 0xFF \
+        ? (cast_void(len = (ts)->shrlen), (ts)->contents) \
+        : (cast_void(len = (ts)->u.lnglen), (ts)->contents))
+
 /* }================================================================== */
 
 
@@ -546,13 +553,21 @@ typedef struct AbsLineInfo {
   int line;
 } AbsLineInfo;
 
+
+/*
+** Flags in Prototypes
+*/
+#define PF_ISVARARG     1
+#define PF_FIXED        2  /* prototype has parts in fixed memory */
+
+
 /*
 ** Function Prototypes
 */
 typedef struct Proto {
   CommonHeader;
   lu_byte numparams;  /* number of fixed (named) parameters */
-  lu_byte is_vararg;
+  lu_byte flag;
   lu_byte maxstacksize;  /* number of registers needed by this function */
   int sizeupvalues;  /* size of 'upvalues' */
   int sizek;  /* size of 'k' */
@@ -746,7 +761,6 @@ typedef struct Table {
   unsigned int alimit;  /* "limit" of 'array' array */
   ArrayCell *array;  /* array part */
   Node *node;
-  Node *lastfree;  /* any free position is before this position */
   struct Table *metatable;
   GCObject *gclist;
 } Table;