run ./preprocess.sh on ./bootstrap

Author: frsyuki

bootstrap

@@ -38,6 +38,9 @@ test -f ChangeLog || touch ChangeLog
 test -f NEWS      || touch NEWS
 test -f README    || touch README
 
+if ! ./preprocess.sh; then
+	exit 1
+fi
 
 ACLOCAL="aclocal"
 ACLOCAL_FILES="aclocal.m4"

mpl.rb

@@ -22,6 +22,10 @@ def args_ref
 		each_join {|i| "A#{i}& a#{i}" }
 	end
 
+	def args_const_ref
+		each_join {|i| "const A#{i}& a#{i}" }
+	end
+
 	def types
 		each_join {|i| "A#{i}" }
 	end
@@ -34,6 +38,10 @@ def types_ref
 		each_join {|i| "A#{i}&" }
 	end
 
+	def types_const_ref
+		each_join {|i| "const A#{i}&" }
+	end
+
 	def params
 		each_join {|i| "a#{i}" }
 	end

mpsrc/wavy_kernel_epoll.h

@@ -223,12 +223,12 @@ class kernel {
 	}
 
 
-	int add_kernel(kernel* pt)
+	int add_kernel(kernel* kern)
 	{
-		if(add_fd(pt->m_ep, EVKERNEL_READ) < 0) {
+		if(add_fd(kern->m_ep, EVKERNEL_READ) < 0) {
 			return -1;
 		}
-		return pt->m_ep;
+		return kern->m_ep;
 	}
 
 	int ident() const

mpsrc/wavy_kernel_kqueue.h

@@ -248,12 +248,12 @@ class kernel {
 	}
 
 
-	int add_kernel(kernel* pt)
+	int add_kernel(kernel* kern)
 	{
-		if(add_fd(pt->m_kq, EVKERNEL_READ) < 0) {
+		if(add_fd(kern->m_kq, EVKERNEL_READ) < 0) {
 			return -1;
 		}
-		return pt->m_kq;
+		return kern->m_kq;
 	}
 
 	int ident() const

mpsrc/wavy_out.cc

@@ -586,7 +586,6 @@ void loop::hvsendfile(int fd,
 }
 
 
-void kak() { }
 }  // namespace wavy
 }  // namespace mp
 

preprocess.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+RUBY="ruby"
+
+function r() {
+	echo "$@"
+	"$@"
+}
+
+function preprocess() {
+	file="$1"
+	out="$(dirname "$file")/$(basename "$file" mpl)"
+	r "$RUBY" mplex -rmpl "$file" -o "$out"
+	if [ "$?" != 0 ]; then
+		echo ""
+		echo "** preprocess failed **"
+		echo ""
+		exit 1
+	fi
+}
+
+preprocess mp/object_callback.hmpl
+preprocess mp/sparse_array.hmpl
+preprocess mp/sync.hmpl
+preprocess mp/wavy.hmpl
+