m-labs · Jan 30, 2012 · Jan 30, 2012 · Jan 30, 2012 · Jan 30, 2012
Showing with 92 additions and 3 deletions.

+2 −1 src/compiler/compiler.c

+1 −1 src/compiler/parser.y

+88 −0 src/compiler/test/stim

+1 −1 src/renderer/stimuli.c
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
@@ -568,7 +568,8 @@ struct patch *patch_copy(struct patch *p)
 		pixbuf_inc_ref(img->pixbuf);
 	}
 	new_patch->stim = stim_get(p->stim);
-	stim_redirect(p->stim, new_patch);
+	if(p->stim)
+		stim_redirect(p->stim, new_patch);
 	return new_patch;
 }
 

diff --git a/src/compiler/parser.y b/src/compiler/parser.y
@@ -315,7 +315,7 @@ assignment ::= ident(I) TOK_ASSIGN TOK_MIDI TOK_LPAREN expr(A) TOK_COMMA
 	sym->stim_regs = stim_add_midi_ctrl(stim,
 	    A->contents.constant, B->contents.constant, P);
 	if(!sym->stim_regs) {
-		FAIL("cannot add stimulus for MIDI channel %d control %d\n",
+		FAIL("cannot add stimulus for MIDI channel %d control %d",
 		    (int) A->contents.constant, (int) B->contents.constant);
 		return;
 	}

diff --git a/src/compiler/test/stim b/src/compiler/test/stim
@@ -0,0 +1,88 @@
+#!/bin/sh
+. ./Common
+
+###############################################################################
+
+ptest "stimuli: midi(0, 0)" -c -q << EOF
+foo = midi(0, 0)
+EOF
+expect <<EOF
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest "stimuli: midi(15, 127)" -c -q << EOF
+foo = midi(15, 127)
+EOF
+expect <<EOF
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest_fail "stimuli: midi(16, 0)" -c -q << EOF
+foo = midi(16, 0)
+EOF
+expect <<EOF
+line 2: cannot add stimulus for MIDI channel 16 control 0 near 'EOF'
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest_fail "stimuli: midi(0, 128)" -c -q << EOF
+foo = midi(0, 128)
+EOF
+expect <<EOF
+line 2: cannot add stimulus for MIDI channel 0 control 128 near 'EOF'
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest_fail "stimuli: midi(-1, 0)" -c -q << EOF
+foo = midi(-1, 0)
+EOF
+expect <<EOF
+line 2: cannot add stimulus for MIDI channel -1 control 0 near 'EOF'
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest_fail "stimuli: midi(0, -1)" -c -q << EOF
+foo = midi(0, -1)
+EOF
+expect <<EOF
+line 2: cannot add stimulus for MIDI channel 0 control -1 near 'EOF'
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest "stimuli: midi(0, 0, linear)" -c -q << EOF
+foo = midi(0, 0, linear)
+EOF
+expect <<EOF
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest "stimuli: midi(0, 0, accel_linear)" -c -q << EOF
+foo = midi(0, 0, accel_linear)
+EOF
+expect <<EOF
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest "stimuli: midi(0, 0, accel_unbounded)" -c -q << EOF
+foo = midi(0, 0, accel_unbounded)
+EOF
+expect <<EOF
+EOF
+
+#------------------------------------------------------------------------------
+
+ptest "stimuli: midi(0, 0, accel_cyclic)" -c -q << EOF
+foo = midi(0, 0, accel_cyclic)
+EOF
+expect <<EOF
+EOF
+
+###############################################################################
diff --git a/src/renderer/stimuli.c b/src/renderer/stimuli.c
@@ -8,9 +8,9 @@
  * the Free Software Foundation, version 3 of the License.
  */
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 
 #include "stimuli.h"