Merge branch 'develop' of https://github.com/stdlib-js/stdlib into develop

Planeshifter · Planeshifter · commit fbf329c760c2 · 2017-11-24T00:32:30.000-05:00
diff --git a/docs/links/database.json b/docs/links/database.json
@@ -2896,6 +2896,7 @@
       "wasm",
       "wabt",
       "wast",
+      "wat",
       "toolkit"
     ]
   },
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/README.md b/lib/node_modules/@stdlib/fs/read-wasm/README.md
@@ -92,7 +92,7 @@ function onRead( error, wasm ) {
     if ( bool ) {
         wasm = new WebAssembly.Module( wasm );
         wasm = new WebAssembly.Instance( wasm, {} );
-        console.log( wasm.exports.c_hypot( 5.0, 12.0 ) );
+        console.log( wasm.exports.stdlib_hypot( 5.0, 12.0 ) );
     } else {
         console.log( wasm );
     }
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/benchmark/fixtures/file.wasm b/lib/node_modules/@stdlib/fs/read-wasm/benchmark/fixtures/file.wasm
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/examples/fixtures/file.wasm b/lib/node_modules/@stdlib/fs/read-wasm/examples/fixtures/file.wasm
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/examples/fixtures/file.wat b/lib/node_modules/@stdlib/fs/read-wasm/examples/fixtures/file.wat
@@ -3,8 +3,8 @@
   (table 0 anyfunc)
   (memory $0 1)
   (export "memory" (memory $0))
-  (export "c_hypot" (func $c_hypot))
-  (func $c_hypot (param $0 f64) (param $1 f64) (result f64)
+  (export "stdlib_hypot" (func $stdlib_hypot))
+  (func $stdlib_hypot (param $0 f64) (param $1 f64) (result f64)
     (local $2 i64)
     (local $3 i64)
     (local $4 f64)
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/examples/index.js b/lib/node_modules/@stdlib/fs/read-wasm/examples/index.js
@@ -18,7 +18,7 @@ function onRead( error, wasm ) {
 	if ( bool ) {
 		wasm = new WebAssembly.Module( wasm ); // eslint-disable-line no-undef
 		wasm = new WebAssembly.Instance( wasm, {} ); // eslint-disable-line no-undef
-		console.log( wasm.exports.c_hypot( 5.0, 12.0 ) );
+		console.log( wasm.exports.stdlib_hypot( 5.0, 12.0 ) );
 	} else {
 		console.log( wasm );
 	}
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/test/fixtures/file.wasm b/lib/node_modules/@stdlib/fs/read-wasm/test/fixtures/file.wasm
diff --git a/lib/node_modules/@stdlib/fs/read-wasm/test/fixtures/file.wat b/lib/node_modules/@stdlib/fs/read-wasm/test/fixtures/file.wat
@@ -3,8 +3,8 @@
   (table 0 anyfunc)
   (memory $0 1)
   (export "memory" (memory $0))
-  (export "c_hypot" (func $c_hypot))
-  (func $c_hypot (param $0 f64) (param $1 f64) (result f64)
+  (export "stdlib_hypot" (func $stdlib_hypot))
+  (func $stdlib_hypot (param $0 f64) (param $1 f64) (result f64)
     (local $2 i64)
     (local $3 i64)
     (local $4 f64)
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/include/hypot.h b/lib/node_modules/@stdlib/math/base/special/hypot/include/hypot.h
@@ -1,8 +1,8 @@
 /**
 * Header file containing function declarations for computing the hypotenuse while avoiding overflow and underflow.
 */
-#ifndef C_HYPOT_H
-#define C_HYPOT_H
+#ifndef STDLIB_HYPOT_H
+#define STDLIB_HYPOT_H
 
 /*
 * If C++, prevent name mangling so that the compiler emits a binary file having undecorated names, thus mirroring the behavior of a C compiler.
@@ -14,10 +14,10 @@ extern "C" {
 /**
 * Computes the hypotenuse, avoiding overflow and underflow.
 */
-double c_hypot( const double x, const double y );
+double stdlib_hypot( const double x, const double y );
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // !C_HYPOT_H
+#endif // !STDLIB_HYPOT_H
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/lib/wasm.js b/lib/node_modules/@stdlib/math/base/special/hypot/lib/wasm.js
@@ -66,7 +66,7 @@ function load() {
 	wasm = new WebAssembly.Instance( wasm, imports );
 
 	// Return the exported function:
-	return wasm.exports._c_hypot; // eslint-disable-line no-underscore-dangle
+	return wasm.exports._stdlib_hypot; // eslint-disable-line no-underscore-dangle
 } // end FUNCTION load()
 
 
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/src/Makefile b/lib/node_modules/@stdlib/math/base/special/hypot/src/Makefile
@@ -80,7 +80,7 @@ EMCCFLAGS ?= $(CFLAGS)
 
 # Shared `emcc` flags:
 EMCC_SHARED_FLAGS := \
-	-s EXPORTED_FUNCTIONS="['_c_hypot']" \
+	-s EXPORTED_FUNCTIONS="['_stdlib_hypot']" \
 	-s STRICT=1 \
 	-s NO_FILESYSTEM=1 \
 	-s ERROR_ON_UNDEFINED_SYMBOLS=1 \
@@ -94,7 +94,7 @@ EMCC_WASM_FLAGS := $(EMCC_SHARED_FLAGS) \
 	-s LEGALIZE_JS_FFI=0
 
 # Define the program for generating WebAssembly text files:
-WASM2WAST ?= wasm2wast
+WASM2WAT ?= wasm2wat
 
 # Determine whether to generate [position independent code][1]:
 #
@@ -133,7 +133,7 @@ addon_objects := addon.o
 wasm_objects := hypot.wasm
 
 # List of WebAssembly text file targets:
-wast_objects := hypot.wast
+wat_objects := hypot.wat
 
 
 # TARGETS #
@@ -193,9 +193,9 @@ $(wasm_objects): %.wasm: %.c
 #
 # This target generates WebAssembly text files from WebAssembly binaries.
 
-$(wast_objects): %.wast: %.wasm
-	$(QUIET) $(WASM2WAST) \
-		-o $*.wast \
+$(wat_objects): %.wat: %.wasm
+	$(QUIET) $(WASM2WAT) \
+		-o $*.wat \
 		$<
 
 
@@ -211,7 +211,7 @@ addon.node: $(addon_objects)
 #
 # This target generates WebAssembly files.
 
-wasm: clean-wasm $(wasm_objects) $(wast_objects)
+wasm: clean-wasm $(wasm_objects) $(wat_objects)
 
 .PHONY: wasm
 
@@ -243,7 +243,7 @@ clean-addon:
 # This target removes generated files for compiling to WebAssembly.
 
 clean-wasm:
-	$(QUIET) -rm -f *.wasm *.wast
+	$(QUIET) -rm -f *.wasm *.wat
 
 .PHONY: clean-wasm
 
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/src/addon.cpp b/lib/node_modules/@stdlib/math/base/special/hypot/src/addon.cpp
@@ -42,7 +42,7 @@ namespace addon_hypot {
 		const double x = info[ 0 ]->NumberValue();
 		const double y = info[ 1 ]->NumberValue();
 
-		Local<Number> h = Nan::New( c_hypot( x, y ) );
+		Local<Number> h = Nan::New( stdlib_hypot( x, y ) );
 		info.GetReturnValue().Set( h );
 	}
 
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/src/hypot.c b/lib/node_modules/@stdlib/math/base/special/hypot/src/hypot.c
@@ -11,7 +11,7 @@
 * @param y       number
 * @return        hypotenuse
 */
-double c_hypot( const double x, const double y ) {
+double stdlib_hypot( const double x, const double y ) {
 	double tmp;
 	double a;
 	double b;
diff --git a/lib/node_modules/@stdlib/math/base/special/hypot/src/hypot.wat b/lib/node_modules/@stdlib/math/base/special/hypot/src/hypot.wat
@@ -115,5 +115,5 @@
   (global (;6;) (mut f64) (get_global 1))
   (global (;7;) (mut f64) (get_global 2))
   (export "__post_instantiate" (func 2))
-  (export "_c_hypot" (func 0))
+  (export "_stdlib_hypot" (func 0))
   (export "runPostSets" (func 1)))
diff --git a/tools/lint/filenames/lib/extensions.json b/tools/lint/filenames/lib/extensions.json
@@ -33,6 +33,7 @@
 	".txt",
 	".wasm",
 	".wast",
+	".wat",
 	".woff",
 	".yml",
 	".xml"
diff --git a/tools/make/lib/deps/wabt.mk b/tools/make/lib/deps/wabt.mk
@@ -32,14 +32,14 @@ DEPS_WABT_TEST_OUT ?= $(DEPS_WABT_TEST_DIR)/build
 DEPS_WABT_TEST_INSTALL ?= $(DEPS_WABT_TEST_DIR)/test_install.wasm
 
 # Define output path for a compiled test file:
-DEPS_WABT_TEST_INSTALL_WAST_OUT ?= $(DEPS_WABT_TEST_OUT)/test.wast
+DEPS_WABT_TEST_INSTALL_WAT_OUT ?= $(DEPS_WABT_TEST_OUT)/test.wat
 DEPS_WABT_TEST_INSTALL_WASM_OUT ?= $(DEPS_WABT_TEST_OUT)/test.wasm
 
-# Define the path to the `wasm2wast` utility:
-WASM2WAST ?= $(DEPS_WABT_BUILD_OUT)/wasm2wast
+# Define the path to the `wasm2wat` utility:
+WASM2WAT ?= $(DEPS_WABT_BUILD_OUT)/wasm2wat
 
-# Define the path to the `wast2wasm` utility:
-WAST2WASM ?= $(DEPS_WABT_BUILD_OUT)/wast2wasm
+# Define the path to the `wat2wasm` utility:
+WAT2WASM ?= $(DEPS_WABT_BUILD_OUT)/wat2wasm
 
 
 # TARGETS #
@@ -71,21 +71,21 @@ $(DEPS_WABT_TEST_OUT):
 	$(QUIET) $(MKDIR_RECURSIVE) $(DEPS_WABT_TEST_OUT)
 
 
-# Compile install WAST test.
+# Compile install WAT test.
 #
-# This target compiles a WAST test file for testing an installation.
+# This target compiles a WAT test file for testing an installation.
 
-$(DEPS_WABT_TEST_INSTALL_WAST_OUT): $(DEPS_WABT_BUILD_OUT) $(DEPS_WABT_TEST_OUT)
-	$(QUIET) $(WASM2WAST) $(DEPS_WABT_TEST_INSTALL) \
-		-o $(DEPS_WABT_TEST_INSTALL_WAST_OUT)
+$(DEPS_WABT_TEST_INSTALL_WAT_OUT): $(DEPS_WABT_BUILD_OUT) $(DEPS_WABT_TEST_OUT)
+	$(QUIET) $(WASM2WAT) $(DEPS_WABT_TEST_INSTALL) \
+		-o $(DEPS_WABT_TEST_INSTALL_WAT_OUT)
 
 
 # Compile install WASM test.
 #
 # This target compiles a WASM test file for testing an installation.
 
-$(DEPS_WABT_TEST_INSTALL_WASM_OUT): $(DEPS_WABT_TEST_INSTALL_WAST_OUT)
-	$(QUIET) $(WAST2WASM) $(DEPS_WABT_TEST_INSTALL_WAST_OUT) \
+$(DEPS_WABT_TEST_INSTALL_WASM_OUT): $(DEPS_WABT_TEST_INSTALL_WAT_OUT)
+	$(QUIET) $(WAT2WASM) $(DEPS_WABT_TEST_INSTALL_WAT_OUT) \
 		-o $(DEPS_WABT_TEST_INSTALL_WASM_OUT)
 
 
@@ -158,7 +158,7 @@ deps-update-wabt: $(DEPS_WABT_BUILD_OUT)
 #
 # This target tests an installation.
 
-deps-test-wabt: $(DEPS_WABT_TEST_INSTALL_WAST_OUT) $(DEPS_WABT_TEST_INSTALL_WASM_OUT)
+deps-test-wabt: $(DEPS_WABT_TEST_INSTALL_WAT_OUT) $(DEPS_WABT_TEST_INSTALL_WASM_OUT)
 	$(QUIET) echo '' >&2
 	$(QUIET) echo 'Success.' >&2
 

Original file line number	Diff line number	Diff line change
`@@ -2896,6 +2896,7 @@`
`2896`	`2896`	`"wasm",`
`2897`	`2897`	`"wabt",`
`2898`	`2898`	`"wast",`
	`2899`	`+ "wat",`
`2899`	`2900`	`"toolkit"`
`2900`	`2901`	`]`
`2901`	`2902`	`},`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ function onRead( error, wasm ) {`
`92`	`92`	`if ( bool ) {`
`93`	`93`	`wasm = new WebAssembly.Module( wasm );`
`94`	`94`	`wasm = new WebAssembly.Instance( wasm, {} );`
`95`		`- console.log( wasm.exports.c_hypot( 5.0, 12.0 ) );`
	`95`	`+ console.log( wasm.exports.stdlib_hypot( 5.0, 12.0 ) );`
`96`	`96`	`} else {`
`97`	`97`	`console.log( wasm );`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function onRead( error, wasm ) {`
`18`	`18`	`if ( bool ) {`
`19`	`19`	`wasm = new WebAssembly.Module( wasm ); // eslint-disable-line no-undef`
`20`	`20`	`wasm = new WebAssembly.Instance( wasm, {} ); // eslint-disable-line no-undef`
`21`		`- console.log( wasm.exports.c_hypot( 5.0, 12.0 ) );`
	`21`	`+ console.log( wasm.exports.stdlib_hypot( 5.0, 12.0 ) );`
`22`	`22`	`} else {`
`23`	`23`	`console.log( wasm );`
`24`	`24`	`}`