ref: 48aed4bbb6fa2fba3da9fcf4bc6bf8e81bec48e9
parent: 83dd92f0856c30beffcb04e7e6fc28ea225fdac5
author: Tor Andersson <tor@ccxvii.net>
date: Wed Mar 19 19:07:33 EDT 2014
Name the library: MuJS!
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
SRCS := $(wildcard js*.c utf*.c regex.c)
-HDRS := $(wildcard js*.h utf.h regex.h)
+HDRS := $(wildcard js*.h mujs.h utf.h regex.h)
OBJS := $(SRCS:%.c=build/%.o)
CC := clang
CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wunreachable-code -Wno-unused-parameter -g
-default: build build/js build/jsone build/re
+default: build build/mujs build/mujsone
astnames.h: jsparse.h
grep '\(AST\|EXP\|STM\)_' jsparse.h | sed 's/^[ \t]*\(AST_\)\?/"/;s/,.*/",/' | tr A-Z a-z > $@
@@ -24,13 +24,13 @@
build/%.o: %.c $(HDRS)
$(CC) $(CFLAGS) -o $@ -c $<
-build/libjs.a: $(OBJS)
+build/libmujs.a: $(OBJS)
ar cru $@ $^
-build/js: build/main.o build/libjs.a
+build/mujs: build/main.o build/libmujs.a
$(CC) -o $@ $^ -lm
-build/jsone: build/main.o build/one.o
+build/mujsone: build/main.o build/one.o
$(CC) -o $@ $^ -lm
build/re: regex.c utf.c utftype.c
--- a/README
+++ b/README
@@ -1,1 +1,1 @@
-libjs: An embeddable Javascript interpreter in C.
+MuJS: An embeddable Javascript interpreter in C.
--- a/js.h
+++ /dev/null
@@ -1,175 +1,0 @@
-#ifndef js_h
-#define js_h
-
-/* noreturn is a GCC extension */
-#ifdef __GNUC__
-#define JS_NORETURN __attribute__((noreturn))
-#else
-#ifdef _MSC_VER
-#define JS_NORETURN __declspec(noreturn)
-#else
-#define JS_NORETURN
-#endif
-#endif
-
-/* GCC can do type checking of printf strings */
-#ifdef __printflike
-#define JS_PRINTFLIKE __printflike
-#else
-#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-#define JS_PRINTFLIKE(fmtarg, firstvararg) \
- __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#else
-#define JS_PRINTFLIKE(fmtarg, firstvararg)
-#endif
-#endif
-
-typedef struct js_State js_State;
-
-typedef void *(*js_Alloc)(void *memctx, void *ptr, unsigned int size);
-typedef void (*js_Panic)(js_State *J);
-typedef void (*js_CFunction)(js_State *J);
-
-/* Basic functions */
-js_State *js_newstate(js_Alloc alloc, void *actx);
-js_Panic js_atpanic(js_State *J, js_Panic panic);
-void js_freestate(js_State *J);
-void js_gc(js_State *J, int report);
-
-int js_dostring(js_State *J, const char *source, int report);
-int js_dofile(js_State *J, const char *filename);
-int js_ploadstring(js_State *J, const char *filename, const char *source);
-int js_ploadfile(js_State *J, const char *filename);
-int js_pcall(js_State *J, int n);
-int js_pconstruct(js_State *J, int n);
-
-/* RegExp flags */
-enum {- JS_REGEXP_G = 1,
- JS_REGEXP_I = 2,
- JS_REGEXP_M = 4,
-};
-
-/* Hint to ToPrimitive() */
-enum {- JS_HNONE,
- JS_HNUMBER,
- JS_HSTRING
-};
-
-/* Property attribute flags */
-enum {- JS_READONLY = 1,
- JS_DONTENUM = 2,
- JS_DONTCONF = 4,
-};
-
-void js_newerror(js_State *J, const char *message);
-void js_newevalerror(js_State *J, const char *message);
-void js_newrangeerror(js_State *J, const char *message);
-void js_newreferenceerror(js_State *J, const char *message);
-void js_newsyntaxerror(js_State *J, const char *message);
-void js_newtypeerror(js_State *J, const char *message);
-void js_newurierror(js_State *J, const char *message);
-
-JS_NORETURN void js_error(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_evalerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_rangeerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_referenceerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_syntaxerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_typeerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_urierror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
-JS_NORETURN void js_throw(js_State *J);
-
-void js_loadstring(js_State *J, const char *filename, const char *source);
-void js_loadfile(js_State *J, const char *filename);
-
-void js_call(js_State *J, int n);
-void js_construct(js_State *J, int n);
-
-const char *js_ref(js_State *J);
-void js_unref(js_State *J, const char *ref);
-
-void js_getregistry(js_State *J, const char *name);
-void js_setregistry(js_State *J, const char *name);
-void js_delregistry(js_State *J, const char *name);
-
-void js_getglobal(js_State *J, const char *name);
-void js_setglobal(js_State *J, const char *name);
-void js_defglobal(js_State *J, const char *name, int atts);
-
-int js_hasproperty(js_State *J, int idx, const char *name);
-void js_getproperty(js_State *J, int idx, const char *name);
-void js_setproperty(js_State *J, int idx, const char *name);
-void js_defproperty(js_State *J, int idx, const char *name, int atts);
-void js_delproperty(js_State *J, int idx, const char *name);
-void js_defaccessor(js_State *J, int idx, const char *name, int atts);
-
-unsigned int js_getlength(js_State *J, int idx);
-void js_setlength(js_State *J, int idx, unsigned int len);
-int js_hasindex(js_State *J, int idx, unsigned int i);
-void js_getindex(js_State *J, int idx, unsigned int i);
-void js_setindex(js_State *J, int idx, unsigned int i);
-void js_delindex(js_State *J, int idx, unsigned int i);
-
-void js_currentfunction(js_State *J);
-void js_pushglobal(js_State *J);
-void js_pushundefined(js_State *J);
-void js_pushnull(js_State *J);
-void js_pushboolean(js_State *J, int v);
-void js_pushnumber(js_State *J, double v);
-void js_pushstring(js_State *J, const char *v);
-void js_pushlstring(js_State *J, const char *v, unsigned int n);
-void js_pushliteral(js_State *J, const char *v);
-
-void js_newobject(js_State *J);
-void js_newarray(js_State *J);
-void js_newboolean(js_State *J, int v);
-void js_newnumber(js_State *J, double v);
-void js_newstring(js_State *J, const char *v);
-void js_newerror(js_State *J, const char *message);
-void js_newcfunction(js_State *J, js_CFunction fun, unsigned int length);
-void js_newcconstructor(js_State *J, js_CFunction fun, js_CFunction con, unsigned int length);
-void js_newuserdata(js_State *J, const char *tag, void *data);
-void js_newregexp(js_State *J, const char *pattern, int flags);
-
-int js_isdefined(js_State *J, int idx);
-int js_isundefined(js_State *J, int idx);
-int js_isnull(js_State *J, int idx);
-int js_isboolean(js_State *J, int idx);
-int js_isnumber(js_State *J, int idx);
-int js_isstring(js_State *J, int idx);
-int js_isprimitive(js_State *J, int idx);
-int js_isobject(js_State *J, int idx);
-int js_isarray(js_State *J, int idx);
-int js_isregexp(js_State *J, int idx);
-int js_iscallable(js_State *J, int idx);
-int js_isuserdata(js_State *J, const char *tag, int idx);
-
-int js_toboolean(js_State *J, int idx);
-double js_tonumber(js_State *J, int idx);
-const char *js_tostring(js_State *J, int idx);
-void *js_touserdata(js_State *J, const char *tag, int idx);
-
-double js_tointeger(js_State *J, int idx);
-int js_toint32(js_State *J, int idx);
-unsigned int js_touint32(js_State *J, int idx);
-short js_toint16(js_State *J, int idx);
-unsigned short js_touint16(js_State *J, int idx);
-
-int js_gettop(js_State *J);
-void js_settop(js_State *J, int idx);
-void js_pop(js_State *J, int n);
-void js_rot(js_State *J, int n);
-void js_copy(js_State *J, int idx);
-void js_remove(js_State *J, int idx);
-void js_insert(js_State *J, int idx);
-void js_replace(js_State* J, int idx);
-
-void js_concat(js_State *J);
-int js_compare(js_State *J, int *okay);
-int js_equal(js_State *J);
-int js_strictequal(js_State *J);
-int js_instanceof(js_State *J);
-
-#endif
--- a/jsi.h
+++ b/jsi.h
@@ -1,7 +1,7 @@
#ifndef jsi_h
#define jsi_h
-#include "js.h"
+#include "mujs.h"
#include <stdio.h>
#include <stdlib.h>
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include "js.h"
+#include "mujs.h"
#define PS1 "> "
--- /dev/null
+++ b/mujs.h
@@ -1,0 +1,175 @@
+#ifndef mujs_h
+#define mujs_h
+
+/* noreturn is a GCC extension */
+#ifdef __GNUC__
+#define JS_NORETURN __attribute__((noreturn))
+#else
+#ifdef _MSC_VER
+#define JS_NORETURN __declspec(noreturn)
+#else
+#define JS_NORETURN
+#endif
+#endif
+
+/* GCC can do type checking of printf strings */
+#ifdef __printflike
+#define JS_PRINTFLIKE __printflike
+#else
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+#define JS_PRINTFLIKE(fmtarg, firstvararg) \
+ __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+#else
+#define JS_PRINTFLIKE(fmtarg, firstvararg)
+#endif
+#endif
+
+typedef struct js_State js_State;
+
+typedef void *(*js_Alloc)(void *memctx, void *ptr, unsigned int size);
+typedef void (*js_Panic)(js_State *J);
+typedef void (*js_CFunction)(js_State *J);
+
+/* Basic functions */
+js_State *js_newstate(js_Alloc alloc, void *actx);
+js_Panic js_atpanic(js_State *J, js_Panic panic);
+void js_freestate(js_State *J);
+void js_gc(js_State *J, int report);
+
+int js_dostring(js_State *J, const char *source, int report);
+int js_dofile(js_State *J, const char *filename);
+int js_ploadstring(js_State *J, const char *filename, const char *source);
+int js_ploadfile(js_State *J, const char *filename);
+int js_pcall(js_State *J, int n);
+int js_pconstruct(js_State *J, int n);
+
+/* RegExp flags */
+enum {+ JS_REGEXP_G = 1,
+ JS_REGEXP_I = 2,
+ JS_REGEXP_M = 4,
+};
+
+/* Hint to ToPrimitive() */
+enum {+ JS_HNONE,
+ JS_HNUMBER,
+ JS_HSTRING
+};
+
+/* Property attribute flags */
+enum {+ JS_READONLY = 1,
+ JS_DONTENUM = 2,
+ JS_DONTCONF = 4,
+};
+
+void js_newerror(js_State *J, const char *message);
+void js_newevalerror(js_State *J, const char *message);
+void js_newrangeerror(js_State *J, const char *message);
+void js_newreferenceerror(js_State *J, const char *message);
+void js_newsyntaxerror(js_State *J, const char *message);
+void js_newtypeerror(js_State *J, const char *message);
+void js_newurierror(js_State *J, const char *message);
+
+JS_NORETURN void js_error(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_evalerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_rangeerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_referenceerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_syntaxerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_typeerror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_urierror(js_State *J, const char *fmt, ...) JS_PRINTFLIKE(2,3);
+JS_NORETURN void js_throw(js_State *J);
+
+void js_loadstring(js_State *J, const char *filename, const char *source);
+void js_loadfile(js_State *J, const char *filename);
+
+void js_call(js_State *J, int n);
+void js_construct(js_State *J, int n);
+
+const char *js_ref(js_State *J);
+void js_unref(js_State *J, const char *ref);
+
+void js_getregistry(js_State *J, const char *name);
+void js_setregistry(js_State *J, const char *name);
+void js_delregistry(js_State *J, const char *name);
+
+void js_getglobal(js_State *J, const char *name);
+void js_setglobal(js_State *J, const char *name);
+void js_defglobal(js_State *J, const char *name, int atts);
+
+int js_hasproperty(js_State *J, int idx, const char *name);
+void js_getproperty(js_State *J, int idx, const char *name);
+void js_setproperty(js_State *J, int idx, const char *name);
+void js_defproperty(js_State *J, int idx, const char *name, int atts);
+void js_delproperty(js_State *J, int idx, const char *name);
+void js_defaccessor(js_State *J, int idx, const char *name, int atts);
+
+unsigned int js_getlength(js_State *J, int idx);
+void js_setlength(js_State *J, int idx, unsigned int len);
+int js_hasindex(js_State *J, int idx, unsigned int i);
+void js_getindex(js_State *J, int idx, unsigned int i);
+void js_setindex(js_State *J, int idx, unsigned int i);
+void js_delindex(js_State *J, int idx, unsigned int i);
+
+void js_currentfunction(js_State *J);
+void js_pushglobal(js_State *J);
+void js_pushundefined(js_State *J);
+void js_pushnull(js_State *J);
+void js_pushboolean(js_State *J, int v);
+void js_pushnumber(js_State *J, double v);
+void js_pushstring(js_State *J, const char *v);
+void js_pushlstring(js_State *J, const char *v, unsigned int n);
+void js_pushliteral(js_State *J, const char *v);
+
+void js_newobject(js_State *J);
+void js_newarray(js_State *J);
+void js_newboolean(js_State *J, int v);
+void js_newnumber(js_State *J, double v);
+void js_newstring(js_State *J, const char *v);
+void js_newerror(js_State *J, const char *message);
+void js_newcfunction(js_State *J, js_CFunction fun, unsigned int length);
+void js_newcconstructor(js_State *J, js_CFunction fun, js_CFunction con, unsigned int length);
+void js_newuserdata(js_State *J, const char *tag, void *data);
+void js_newregexp(js_State *J, const char *pattern, int flags);
+
+int js_isdefined(js_State *J, int idx);
+int js_isundefined(js_State *J, int idx);
+int js_isnull(js_State *J, int idx);
+int js_isboolean(js_State *J, int idx);
+int js_isnumber(js_State *J, int idx);
+int js_isstring(js_State *J, int idx);
+int js_isprimitive(js_State *J, int idx);
+int js_isobject(js_State *J, int idx);
+int js_isarray(js_State *J, int idx);
+int js_isregexp(js_State *J, int idx);
+int js_iscallable(js_State *J, int idx);
+int js_isuserdata(js_State *J, const char *tag, int idx);
+
+int js_toboolean(js_State *J, int idx);
+double js_tonumber(js_State *J, int idx);
+const char *js_tostring(js_State *J, int idx);
+void *js_touserdata(js_State *J, const char *tag, int idx);
+
+double js_tointeger(js_State *J, int idx);
+int js_toint32(js_State *J, int idx);
+unsigned int js_touint32(js_State *J, int idx);
+short js_toint16(js_State *J, int idx);
+unsigned short js_touint16(js_State *J, int idx);
+
+int js_gettop(js_State *J);
+void js_settop(js_State *J, int idx);
+void js_pop(js_State *J, int n);
+void js_rot(js_State *J, int n);
+void js_copy(js_State *J, int idx);
+void js_remove(js_State *J, int idx);
+void js_insert(js_State *J, int idx);
+void js_replace(js_State* J, int idx);
+
+void js_concat(js_State *J);
+int js_compare(js_State *J, int *okay);
+int js_equal(js_State *J);
+int js_strictequal(js_State *J);
+int js_instanceof(js_State *J);
+
+#endif