Skip to content

Commit

Permalink
Remove trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
ndreynolds authored and Nick Reynolds committed Apr 21, 2017
1 parent dff2e13 commit 0dcc9cb
Show file tree
Hide file tree
Showing 42 changed files with 485 additions and 485 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2012-2013 Nick Reynolds <[email protected]>
Copyright (c) 2012-2017 Nick Reynolds <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Makefile
#
# Copyright (c) 2012-2013 Nick Reynolds
#
# Copyright (c) 2012-2017 Nick Reynolds
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
Expand Down Expand Up @@ -133,7 +133,7 @@ default: linker
ctest:
node ctest/crunner.js

test:
test:
bin/test $(TEST_FLAGS) -x bin/flat

test-node:
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Flathead is a tiny, portable JavaScript (ECMA-262) interpreter written in C.
The interpreter does a direct evaluation of the parse tree—it does not
currently build any further IR or perform any optimizations. As a result, it
starts up very quickly, and performs well on code that wouldn't benefit much
from optimization, and less well on code that would (e.g. loops).
from optimization, and less well on code that would (e.g. loops).

Flathead builds on Linux, OSX and \*BSD, on x86, x86_64 and ARM architectures.

Expand All @@ -22,7 +22,7 @@ work to be done on [the Docket](#the-docket).

Installing
----------
Download or clone the source and run `make` within.
Download or clone the source and run `make` within.

git clone https://github.com/ndreynolds/flathead.git
cd flathead
Expand All @@ -31,7 +31,7 @@ Download or clone the source and run `make` within.
This creates an executable at `bin/flat` within the source directory. (You can
optionally run `make install` to copy this to `/usr/local/bin/`.)

#### Dependencies
#### Dependencies

If you received any errors, you may just be missing dependencies.

Expand Down Expand Up @@ -75,7 +75,7 @@ View the parse tree with `-n`:
See all the options with `-h`:

$ bin/flat -h
Usage: flat [options] [script.js]
Usage: flat [options] [script.js]

Options:
-v, --version print version info
Expand All @@ -97,15 +97,15 @@ before you can run the tests.

The Makefile has a few shortcuts:

`make test` to run with Flathead's `bin/flat` executable.
`make test-v8` to run using `v8`.
`make test-node` to run using `node`.
`make test-sm` to run using `js` (SpiderMonkey).
`make test-rhino` to run using `rhino`.
`make test` to run with Flathead's `bin/flat` executable.
`make test-v8` to run using `v8`.
`make test-node` to run using `node`.
`make test-sm` to run using `js` (SpiderMonkey).
`make test-rhino` to run using `rhino`.

There's also:

`make test-grammar` to verify parsing and AST formation
`make test-grammar` to verify parsing and AST formation


The Docket
Expand Down
78 changes: 39 additions & 39 deletions ext/uthash.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#ifndef UTHASH_H
#define UTHASH_H
#define UTHASH_H

#include <string.h> /* memcmp,strlen */
#include <stddef.h> /* ptrdiff_t */
Expand All @@ -49,7 +49,7 @@ do {
char **_da_dst = (char**)(&(dst)); \
*_da_dst = (char*)(src); \
} while(0)
#else
#else
#define DECLTYPE_ASSIGN(dst,src) \
do { \
(dst) = DECLTYPE(dst)(src); \
Expand Down Expand Up @@ -114,12 +114,12 @@ do {
if (!((tbl)->bloom_bv)) { uthash_fatal( "out of memory"); } \
memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN); \
(tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \
} while (0)
} while (0)

#define HASH_BLOOM_FREE(tbl) \
do { \
uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \
} while (0)
} while (0)

#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
Expand All @@ -131,9 +131,9 @@ do {
HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))

#else
#define HASH_BLOOM_MAKE(tbl)
#define HASH_BLOOM_FREE(tbl)
#define HASH_BLOOM_ADD(tbl,hashv)
#define HASH_BLOOM_MAKE(tbl)
#define HASH_BLOOM_FREE(tbl)
#define HASH_BLOOM_ADD(tbl,hashv)
#define HASH_BLOOM_TEST(tbl,hashv) (1)
#define HASH_BLOOM_BYTELEN 0
#endif
Expand Down Expand Up @@ -169,7 +169,7 @@ do {
}; \
HASH_ADD(hh,head,fieldname,keylen_in,add); \
} while(0)

#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \
do { \
unsigned _ha_bkt; \
Expand Down Expand Up @@ -327,10 +327,10 @@ do {
} \
} while (0)
#else
#define HASH_FSCK(hh,head)
#define HASH_FSCK(hh,head)
#endif

/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
* the descriptor to which this macro is defined for tuning the hash function.
* The app can #include <unistd.h> to get the prototype for write(2). */
#ifdef HASH_EMIT_KEYS
Expand All @@ -340,12 +340,12 @@ do {
write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \
write(HASH_EMIT_KEYS, keyptr, fieldlen); \
} while (0)
#else
#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
#else
#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
#endif

/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
#ifdef HASH_FUNCTION
#ifdef HASH_FUNCTION
#define HASH_FCN HASH_FUNCTION
#else
#define HASH_FCN HASH_JEN
Expand All @@ -362,7 +362,7 @@ do {
} while (0)


/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
#define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \
do { \
Expand All @@ -383,8 +383,8 @@ do {
hashv = hashv ^ _hf_key[_fn_i]; \
hashv = hashv * 16777619; \
bkt = hashv & (num_bkts-1); \
} while(0)
} while(0)

#define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \
do { \
unsigned _ho_i; \
Expand Down Expand Up @@ -508,12 +508,12 @@ do {
hashv ^= hashv << 25; \
hashv += hashv >> 6; \
bkt = hashv & (num_bkts-1); \
} while(0)
} while(0)

#ifdef HASH_USING_NO_STRICT_ALIASING
/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
* For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
* MurmurHash uses the faster approach only on CPU's where we know it's safe.
* MurmurHash uses the faster approach only on CPU's where we know it's safe.
*
* Note the preprocessor built-in defines can be emitted using:
*
Expand Down Expand Up @@ -592,7 +592,7 @@ do { \
#endif /* HASH_USING_NO_STRICT_ALIASING */

/* key comparison function; return 0 if keys equal */
#define HASH_KEYCMP(a,b,len) memcmp(a,b,len)
#define HASH_KEYCMP(a,b,len) memcmp(a,b,len)

/* iterate over items in a known bucket to find desired item */
#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \
Expand Down Expand Up @@ -633,36 +633,36 @@ do {
} \
if (hh_del->hh_next) { \
hh_del->hh_next->hh_prev = hh_del->hh_prev; \
}
}

/* Bucket expansion has the effect of doubling the number of buckets
* and redistributing the items into the new buckets. Ideally the
* items will distribute more or less evenly into the new buckets
* (the extent to which this is true is a measure of the quality of
* the hash function as it applies to the key domain).
*
* the hash function as it applies to the key domain).
*
* With the items distributed into more buckets, the chain length
* (item count) in each bucket is reduced. Thus by expanding buckets
* the hash keeps a bound on the chain length. This bounded chain
* the hash keeps a bound on the chain length. This bounded chain
* length is the essence of how a hash provides constant time lookup.
*
*
* The calculation of tbl->ideal_chain_maxlen below deserves some
* explanation. First, keep in mind that we're calculating the ideal
* maximum chain length based on the *new* (doubled) bucket count.
* In fractions this is just n/b (n=number of items,b=new num buckets).
* Since the ideal chain length is an integer, we want to calculate
* Since the ideal chain length is an integer, we want to calculate
* ceil(n/b). We don't depend on floating point arithmetic in this
* hash, so to calculate ceil(n/b) with integers we could write
*
*
* ceil(n/b) = (n/b) + ((n%b)?1:0)
*
*
* and in fact a previous version of this hash did just that.
* But now we have improved things a bit by recognizing that b is
* always a power of two. We keep its base 2 log handy (call it lb),
* so now we can write this with a bit shift and logical AND:
*
*
* ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
*
*
*/
#define HASH_EXPAND_BUCKETS(tbl) \
do { \
Expand Down Expand Up @@ -714,7 +714,7 @@ do {


/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
/* Note that HASH_SORT assumes the hash handle name to be hh.
/* Note that HASH_SORT assumes the hash handle name to be hh.
* HASH_SRT was added to allow the hash handle name to be passed in. */
#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
#define HASH_SRT(hh,head,cmpfcn) \
Expand Down Expand Up @@ -804,10 +804,10 @@ do {
} \
} while (0)

/* This function selects items from one hash into another hash.
* The end result is that the selected items have dual presence
* in both hashes. There is no copy of the items made; rather
* they are added into the new hash through a secondary hash
/* This function selects items from one hash into another hash.
* The end result is that the selected items have dual presence
* in both hashes. There is no copy of the items made; rather
* they are added into the new hash through a secondary hash
* hash handle that must be present in the structure. */
#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \
do { \
Expand Down Expand Up @@ -867,15 +867,15 @@ do {
#ifdef NO_DECLTYPE
#define HASH_ITER(hh,head,el,tmp) \
for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \
el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL))
el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL))
#else
#define HASH_ITER(hh,head,el,tmp) \
for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); \
el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL))
#endif

/* obtain a count of items in the hash */
#define HASH_COUNT(head) HASH_CNT(hh,head)
#define HASH_COUNT(head) HASH_CNT(hh,head)
#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0)

typedef struct UT_hash_bucket {
Expand All @@ -884,15 +884,15 @@ typedef struct UT_hash_bucket {

/* expand_mult is normally set to 0. In this situation, the max chain length
* threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
* the bucket's chain exceeds this length, bucket expansion is triggered).
* the bucket's chain exceeds this length, bucket expansion is triggered).
* However, setting expand_mult to a non-zero value delays bucket expansion
* (that would be triggered by additions to this particular bucket)
* until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
* (The multiplier is simply expand_mult+1). The whole idea of this
* multiplier is to reduce bucket expansions, since they are expensive, in
* situations where we know that a particular bucket tends to be overused.
* It is better to let its chain length grow to a longer yet-still-bounded
* value, than to do an O(n) bucket expansion too often.
* value, than to do an O(n) bucket expansion too often.
*/
unsigned expand_mult;

Expand All @@ -918,7 +918,7 @@ typedef struct UT_hash_table {
* hash distribution; reaching them in a chain traversal takes >ideal steps */
unsigned nonideal_items;

/* ineffective expands occur when a bucket doubling was performed, but
/* ineffective expands occur when a bucket doubling was performed, but
* afterward, more than half the items in the hash had nonideal chain
* positions. If this happens on two consecutive expansions we inhibit any
* further expansion, as it's not helping; this happens when the hash
Expand Down
12 changes: 6 additions & 6 deletions src/args.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* args.c -- singly linked list used internally to represent arguments
* args.c -- singly linked list used internally to represent arguments
*
* Copyright (c) 2013 Nick Reynolds
*
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
Expand All @@ -31,7 +31,7 @@ args_new()
void
args_append(js_args *args, js_val *val)
{
if (args->arg == NULL)
if (args->arg == NULL)
args->arg = val;
else {
while (args->next != NULL) args = args->next;
Expand All @@ -45,9 +45,9 @@ args_get(js_args *args, int n)
{
int i;
for (i = 0; i <= n; i++) {
if (i == n)
if (i == n)
return args->arg ? args->arg : JSUNDEF();
if (args->next == NULL)
if (args->next == NULL)
break;
args = args->next;
}
Expand Down
6 changes: 3 additions & 3 deletions src/args.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* args.h -- singly linked list used internally to represent arguments
* args.h -- singly linked list used internally to represent arguments
*
* Copyright (c) 2013 Nick Reynolds
*
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
Expand Down
Loading

0 comments on commit 0dcc9cb

Please sign in to comment.