fix code style

cli/main.c

@@ -13,18 +13,18 @@
 typedef struct
 {
   const char *cmd;
-  bool optHelp;
-  bool optVersion;
-  bool optEval;
-  bool optAnalyze;
-  bool optDump;
-  bool optCompile;
-  bool optRun;
-  int stackSize; 
+  bool       optHelp;
+  bool       optVersion;
+  bool       optEval;
+  bool       optAnalyze;
+  bool       optDump;
+  bool       optCompile;
+  bool       optRun;
+  int        stackSize; 
   const char *input;
   const char *output;
   const char **args;
-  int numArgs;
+  int        numArgs;
 } ParsedArgs;
 
 static inline void fatal_error(const char *fmt, ...);

core/lists.c

@@ -10,13 +10,13 @@ typedef struct LinkedListNode
 {
   struct LinkedListNode *next;
   struct LinkedListNode *prev;
-  HkValue elem;
+  HkValue               elem;
 } LinkedListNode;
 
 typedef struct
 {
   HK_USERDATA_HEADER
-  int length;
+  int            length;
   LinkedListNode *head;
   LinkedListNode *tail;
 } LinkedList;

core/socket.c

@@ -34,9 +34,9 @@
 typedef struct
 {
   HK_USERDATA_HEADER
-  int domain;
-  int type;
-  int protocol;
+  int    domain;
+  int    type;
+  int    protocol;
   Socket sock;
 } SocketUserdata;
 

extensions/curl.c

@@ -9,10 +9,10 @@
 typedef struct
 {
   HK_USERDATA_HEADER
-  CURL *curl;
+  CURL     *curl;
   CURLcode res;
   HkString *url;
-  HkArray *headers;
+  HkArray  *headers;
 } CurlWrapper;
 
 static int initialized = 0;

include/hook/array.h

@@ -17,8 +17,8 @@
 typedef struct
 {
   HK_OBJECT_HEADER
-  int capacity;
-  int length;
+  int     capacity;
+  int     length;
   HkValue *elements;
 } HkArray;
 

include/hook/callable.h

@@ -9,34 +9,36 @@
 #include "chunk.h"
 #include "string.h"
 
-typedef struct hk_function
+typedef struct HkFunction
 {
   HK_OBJECT_HEADER
-  int arity;
-  HkString *name;
-  HkString *file;
-  HkChunk chunk;
-  uint8_t functionsCapacity;
-  uint8_t functionsLength;
-  struct hk_function **functions;
-  uint8_t numNonlocals;
+  int               arity;
+  HkString          *name;
+  HkString          *file;
+  HkChunk           chunk;
+  uint8_t           functionsCapacity;
+  uint8_t           functionsLength;
+  struct HkFunction **functions;
+  uint8_t           numNonlocals;
 } HkFunction;
 
 typedef struct
 {
   HK_OBJECT_HEADER
   HkFunction *fn;
-  HkValue nonlocals[1];
+  HkValue    nonlocals[1];
 } HkClosure;
 
-struct hk_state;
+struct HkState;
+
+typedef void (*HkCallFn)(struct HkState *, HkValue *);
 
 typedef struct
 {
   HK_OBJECT_HEADER
-  int arity;
+  int      arity;
   HkString *name;
-  void (*call)(struct hk_state *, HkValue *);
+  HkCallFn call;
 } HkNative;
 
 HkFunction *hk_function_new(int arity, HkString *name, HkString *file);
@@ -48,7 +50,7 @@ HkFunction *hk_function_deserialize(FILE *stream);
 HkClosure *hk_closure_new(HkFunction *fn);
 void hk_closure_free(HkClosure *cl);
 void hk_closure_release(HkClosure *cl);
-HkNative *hk_native_new(HkString *name, int arity, void (*call)(struct hk_state *, HkValue *));
+HkNative *hk_native_new(HkString *name, int arity, HkCallFn call);
 void hk_native_free(HkNative *native);
 void hk_native_release(HkNative *native);
 

include/hook/chunk.h

@@ -43,12 +43,12 @@ typedef struct
 
 typedef struct
 {
-  int codeCapacity;
-  int codeLength;
+  int     codeCapacity;
+  int     codeLength;
   uint8_t *code;
-  int linesCapacity;
-  int linesLength;
-  HkLine *lines;
+  int     linesCapacity;
+  int     linesLength;
+  HkLine  *lines;
   HkArray *consts;
 } HkChunk;
 

include/hook/iterator.h

@@ -9,20 +9,20 @@
 #include "value.h"
 
 #define HK_ITERATOR_HEADER HK_OBJECT_HEADER \
-                           void (*deinit)(struct hk_iterator *); \
-                           bool (*isValid)(struct hk_iterator *); \
-                           HkValue (*getCurrent)(struct hk_iterator *); \
-                           struct hk_iterator *(*next)(struct hk_iterator *); \
-                           void (*inplaceNext)(struct hk_iterator *);
+                           void (*deinit)(struct HkIterator *); \
+                           bool (*isValid)(struct HkIterator *); \
+                           HkValue (*getCurrent)(struct HkIterator *); \
+                           struct HkIterator *(*next)(struct HkIterator *); \
+                           void (*inplaceNext)(struct HkIterator *);
 
-typedef struct hk_iterator
+typedef struct HkIterator
 {
   HK_ITERATOR_HEADER
 } HkIterator;
 
-void hk_iterator_init(HkIterator *it, void (*deinit)(struct hk_iterator *),
-  bool (*isValid)(struct hk_iterator *), HkValue (*getCurrent)(struct hk_iterator *),
-  struct hk_iterator *(*next)(struct hk_iterator *), void (*inplaceNext)(struct hk_iterator *));
+void hk_iterator_init(HkIterator *it, void (*deinit)(HkIterator *),
+  bool (*isValid)(HkIterator *), HkValue (*getCurrent)(HkIterator *),
+  HkIterator *(*next)(HkIterator *), void (*inplaceNext)(HkIterator *));
 void hk_iterator_free(HkIterator *it);
 void hk_iterator_release(HkIterator *it);
 bool hk_iterator_is_valid(HkIterator *it);

include/hook/range.h

@@ -12,7 +12,7 @@
 typedef struct
 {
   HK_OBJECT_HEADER
-  int step;
+  int     step;
   int64_t start;
   int64_t end;
 } HkRange;

include/hook/state.h

@@ -35,12 +35,12 @@ typedef enum
   HK_STATE_STATUS_ERROR
 } HkSateStatus;
 
-typedef struct hk_state
+typedef struct HkState
 {
-  int stackEnd;
-  int stackTop;
-  HkValue *stackSlots;
-  int flags;
+  int          stackEnd;
+  int          stackTop;
+  HkValue      *stackSlots;
+  int          flags;
   HkSateStatus status;
 } HkState;
 
@@ -74,7 +74,8 @@ void hk_state_push_instance(HkState *state, HkInstance *inst);
 void hk_state_push_iterator(HkState *state, HkIterator *it);
 void hk_state_push_closure(HkState *state, HkClosure *cl);
 void hk_state_push_native(HkState *state, HkNative *native);
-void hk_state_push_new_native(HkState *state, const char *name, int arity, void (*call)(HkState *, HkValue *));
+void hk_state_push_new_native(HkState *state, const char *name, int arity,
+  HkCallFn call);
 void hk_state_push_userdata(HkState *state, HkUserdata *udata);
 void hk_state_array(HkState *state, int length);
 void hk_state_struct(HkState *state, int length);

include/hook/string.h

@@ -22,9 +22,9 @@
 typedef struct
 {
   HK_OBJECT_HEADER
-  int capacity;
-  int length;
-  char *chars;
+  int     capacity;
+  int     length;
+  char    *chars;
   int64_t hash;
 } HkString;
 

include/hook/struct.h

@@ -16,25 +16,25 @@
 typedef struct
 {
   HkString *name;
-  int index;
+  int      index;
 } HkField;
 
 typedef struct
 {
   HK_OBJECT_HEADER
-  int capacity;
-  int mask;
-  int length;
+  int      capacity;
+  int      mask;
+  int      length;
   HkString *name;
-  HkField *fields;
-  HkField **table;
+  HkField  *fields;
+  HkField  **table;
 } HkStruct;
 
 typedef struct
 {
   HK_OBJECT_HEADER
   HkStruct *ztruct;
-  HkValue values[1];
+  HkValue  values[1];
 } HkInstance;
 
 HkStruct *hk_struct_new(HkString *name);

include/hook/value.h

@@ -89,13 +89,13 @@ typedef enum
 
 typedef struct
 {
-  HkType type;
-  int flags;
+  HkType   type;
+  int      flags;
   union
   {
-    bool boolean;
+    bool   boolean;
     double number;
-    void *pointer;
+    void   *pointer;
   } as;
 } HkValue;
 

src/array.c

@@ -12,7 +12,7 @@ typedef struct
 {
   HK_ITERATOR_HEADER
   HkArray *arr;
-  int current;
+  int     current;
 } ArrayIterator;
 
 static inline HkArray *array_allocate(int minCapacity);

src/callable.c

@@ -161,7 +161,7 @@ void hk_closure_release(HkClosure *cl)
     hk_closure_free(cl);
 }
 
-HkNative *hk_native_new(HkString *name, int arity, void (*call)(struct hk_state *, HkValue *))
+HkNative *hk_native_new(HkString *name, int arity, HkCallFn call)
 {
   HkNative *native = (HkNative *) hk_allocate(sizeof(*native));
   native->refCount = 0;

src/compiler.c

@@ -45,34 +45,34 @@ typedef enum
 
 typedef struct
 {
-  bool isLocal;
-  int depth;
+  bool    isLocal;
+  int     depth;
   uint8_t index;
-  int length;
-  char *start;
-  bool isMutable;
+  int     length;
+  char    *start;
+  bool    isMutable;
 } Variable;
 
 typedef struct Loop
 {
   struct Loop *parent;
-  int scopeDepth;
-  uint16_t jump;
-  int numOffsets;
-  int offsets[MAX_BREAKS];
+  int         scopeDepth;
+  uint16_t    jump;
+  int         numOffsets;
+  int         offsets[MAX_BREAKS];
 } Loop;
 
-typedef struct compiler
-{
-  struct compiler *parent;
-  int flags;
-  Scanner *scan;
-  int scopeDepth;
-  int numVariables;
-  uint8_t nextIndex;
-  Variable variables[MAX_VARIABLES];
-  Loop *loop;
-  HkFunction *fn;
+typedef struct Compiler
+{
+  struct Compiler *parent;
+  int             flags;
+  Scanner         *scan;
+  int             scopeDepth;
+  int             numVariables;
+  uint8_t         nextIndex;
+  Variable        variables[MAX_VARIABLES];
+  Loop            *loop;
+  HkFunction      *fn;
 } Compiler;
 
 static inline void syntax_error(HkString *fnName, const char *file, int line,

src/iterator.c

@@ -6,9 +6,9 @@
 #include <hook/iterator.h>
 #include <stdlib.h>
 
-void hk_iterator_init(HkIterator *it, void (*deinit)(struct hk_iterator *),
-  bool (*isValid)(struct hk_iterator *), HkValue (*getCurrent)(struct hk_iterator *),
-  struct hk_iterator *(*next)(struct hk_iterator *), void (*inplaceNext)(struct hk_iterator *))
+void hk_iterator_init(HkIterator *it, void (*deinit)(HkIterator *),
+  bool (*isValid)(HkIterator *), HkValue (*getCurrent)(HkIterator *),
+  HkIterator *(*next)(HkIterator *), void (*inplaceNext)(HkIterator *))
 {
   it->refCount = 0;
   it->deinit = deinit;

src/record.h

@@ -14,14 +14,14 @@
 typedef struct
 {
   HkString *key;
-  HkValue value;
+  HkValue  value;
 } RecordEntry;
 
 typedef struct
 {
-  int capacity;
-  int mask;
-  int length;
+  int         capacity;
+  int         mask;
+  int         length;
   RecordEntry *entries;
 } Record;