[Gridflow-cvs] [svn] commit: r3628 - in /trunk/base: grid.c main.c source_filter.rb

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Apr 18 22:29:05 EDT 2008


Author: matju
Date: Fri Apr 18 22:29:05 2008
New Revision: 3628

Log:
nothing

Modified:
    trunk/base/grid.c
    trunk/base/main.c
    trunk/base/source_filter.rb

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Fri Apr 18 22:29:05 2008
@@ -30,9 +30,6 @@
 #include <sys/time.h>
 #include "../gridflow.h.fcs"
 #include <ctype.h>
-
-#define Pointer_s_new Pointer_s_new_2
-#define Pointer_get   Pointer_get_2
 
 //#define TRACE fprintf(stderr,"%s %s [%s:%d]\n",ARGS(parent),__PRETTY_FUNCTION__,__FILE__,__LINE__);
 #define TRACE
@@ -275,7 +272,6 @@
 	}
 	try {gh->flow(this,-2,(T *)0);} CATCH_IT;
 	//!@#$ add error handling.
-	// rescue; abort(); end ???
 	dim = 0;
 	dex = 0;
 }

Modified: trunk/base/main.c
==============================================================================
--- trunk/base/main.c (original)
+++ trunk/base/main.c Fri Apr 18 22:29:05 2008
@@ -186,10 +186,10 @@
 #define WRITE_LE \
 	for (int bytes = self->bytes; bytes; bytes--, t>>=8) *out++ = t;
 
-#define WRITE_BE { int bytes; \
+#define WRITE_BE {int bytes; \
 	bytes = self->bytes; \
 	while (bytes--) {out[bytes] = t; t>>=8;}\
-	out += self->bytes; }
+	out += self->bytes;}
 
 /* this macro would be faster if the _increment_
    was done only once every loop. or maybe gcc does it, i dunno */
@@ -224,7 +224,7 @@
 /* **************************************************************** */
 
 template <class T>
-static void default_pack(BitPacking *self, long n, T * in, uint8 * out) {
+static void default_pack(BitPacking *self, long n, T *in, uint8 *out) {
 	uint32 t;
 	int i;
 	int sameorder = self->endian==2 || self->endian==::is_le();
@@ -259,10 +259,7 @@
 		int bytes=0; uint32 temp=0; _reader_; \
 		for (int i=0; i<self->size; i++, out++) { \
 			uint32 t=temp&self->mask[i]; \
-			*out = (t<<(7-hb[i]))|(t>>(hb[i]-7)); \
-		} \
-	}
-//			*out++ = ((temp & self->mask[i]) << 7) >> hb[i];
+			*out = (t<<(7-hb[i]))|(t>>(hb[i]-7));}}
 
 template <class T>
 static void default_unpack(BitPacking *self, long n, uint8 * in, T * out) {
@@ -403,8 +400,7 @@
 	return (endian ^ o->endian ^ ::is_le()) == 2;
 }
 
-BitPacking::BitPacking(int endian, int bytes, int size, uint32 *mask,
-Packer *packer, Unpacker *unpacker) {
+BitPacking::BitPacking(int endian, int bytes, int size, uint32 *mask, Packer *packer, Unpacker *unpacker) {
 	this->endian = endian;
 	this->bytes = bytes;
 	this->size = size;
@@ -417,7 +413,6 @@
 	int packeri=-1;
 	this->packer = &bp_packers[0];
 	this->unpacker = &bp_unpackers[0];
-
 	for (int i=0; i<(int)(sizeof(builtin_bitpackers)/sizeof(BitPacking)); i++) {
 		BitPacking *bp = &builtin_bitpackers[i];
 		if (this->eq(bp)) {

Modified: trunk/base/source_filter.rb
==============================================================================
--- trunk/base/source_filter.rb (original)
+++ trunk/base/source_filter.rb Fri Apr 18 22:29:05 2008
@@ -33,12 +33,11 @@
 
 class MethodDecl
 	def ==(o)
-		return false unless rettype==o.rettype &&
-			maxargs==o.maxargs
+		return false unless rettype==o.rettype && maxargs==o.maxargs
 		arglist.each_index{|i| arglist[i] == o.arglist[i] or return false }
 		return true
 	end
-	attr_accessor:done
+	attr_accessor :done
 end
 
 class Arg



More information about the Gridflow-cvs mailing list