[Pixelle-commit] SF.net SVN: pixelle: [74] trunk/pixelle/etc/Pixelle.g

[<dbr...@us...>]

Revision: 74
          http://pixelle.svn.sourceforge.net/pixelle/?rev=74&view=rev
Author:   dbrosius
Date:     2008-06-24 20:12:54 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
better? formatting

Modified Paths:
--------------
    trunk/pixelle/etc/Pixelle.g

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2008-06-25 03:08:13 UTC (rev 73)
+++ trunk/pixelle/etc/Pixelle.g	2008-06-25 03:12:54 UTC (rev 74)
@@ -53,7 +53,11 @@
 }
 
 pixelle :	
-	expr {mv.visitInsn(Opcodes.DRETURN);mv.visitMaxs(0,0);cw.visitEnd();} ;
+	expr 
+	{
+		mv.visitInsn(Opcodes.DRETURN);
+		mv.visitMaxs(0,0);cw.visitEnd();
+	} ;
 	
 expr :
 	cond_expr ;
@@ -81,23 +85,79 @@
     ;	
     
 add_expr :
-	mul_expr (op=('+' | '-') mul_expr {mv.visitInsn("+".equals($op.text)?Opcodes.DADD:Opcodes.DSUB);})* ;
+	mul_expr 
+	(op=('+' | '-') mul_expr 
+		{
+			mv.visitInsn("+".equals($op.text)?Opcodes.DADD:Opcodes.DSUB);
+		}
+	)* ;
 	
 mul_expr	:
-	factor (op=('*' | '/') factor {mv.visitInsn("*".equals($op.text)?Opcodes.DMUL:Opcodes.DDIV);})* ;
+	factor 
+	(op=('*' | '/') factor 
+		{
+			mv.visitInsn("*".equals($op.text)?Opcodes.DMUL:Opcodes.DDIV);
+		}
+	)* ;
 
 factor	
 	:	NUMBER 
-		{mv.visitLdcInsn(Double.valueOf($NUMBER.text));} 
+		{
+			mv.visitLdcInsn(Double.valueOf($NUMBER.text));
+		} 
 	|	'(' expr ')'
-	|   'p' {mv.visitVarInsn(Opcodes.ALOAD, 1);} '[' expr { mv.visitInsn(Opcodes.D2I); } ',' expr { mv.visitInsn(Opcodes.D2I); } ']' '.' spec=('r'|'g'|'b'|'t'|'s') {String s = $spec.text; mv.visitLdcInsn(Character.valueOf(s.charAt(0))); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getValue", "(IIC)D" );} 
-	| 	'x' {mv.visitVarInsn(Opcodes.ILOAD, 2); mv.visitInsn(Opcodes.I2D);}
-	| 	'y' {mv.visitVarInsn(Opcodes.ILOAD, 3); mv.visitInsn(Opcodes.I2D);}
-	|	'width' {mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getWidth", "()I" ); mv.visitInsn(Opcodes.I2D);}
-	|	'height' {mv.visitVarInsn(Opcodes.ALOAD, 1); mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getHeight", "()I" ); mv.visitInsn(Opcodes.I2D);}
-	|	'abs' '(' expr ')' {mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(D)D");}
-	|	'max' '(' expr ',' expr ')' {mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "max", "(DD)D");}
-	|	'min' '(' expr ',' expr ')' {mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "min", "(DD)D");} ;
+	|   'p' 
+		{
+			mv.visitVarInsn(Opcodes.ALOAD, 1);
+		} 
+		'[' expr 
+		{ 
+			mv.visitInsn(Opcodes.D2I); 
+		} 
+		',' expr 
+		{ 
+			mv.visitInsn(Opcodes.D2I); 
+		} 
+		']' '.' spec=('r'|'g'|'b'|'t'|'s') 
+		{
+			String s = $spec.text; 
+			mv.visitLdcInsn(Character.valueOf(s.charAt(0))); 
+			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getValue", "(IIC)D" );
+		} 
+	| 	'x' 
+		{
+			mv.visitVarInsn(Opcodes.ILOAD, 2); 
+			mv.visitInsn(Opcodes.I2D);
+		}
+	| 	'y' 
+		{
+			mv.visitVarInsn(Opcodes.ILOAD, 3); 
+			mv.visitInsn(Opcodes.I2D);
+		}
+	|	'width' 
+		{
+			mv.visitVarInsn(Opcodes.ALOAD, 1); 
+			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getWidth", "()I" ); 
+			mv.visitInsn(Opcodes.I2D);
+		}
+	|	'height' 
+		{
+			mv.visitVarInsn(Opcodes.ALOAD, 1); 
+			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "com/mebigfatguy/pixelle/PixelleEval", "getHeight", "()I" ); 
+			mv.visitInsn(Opcodes.I2D);
+		}
+	|	'abs' '(' expr ')' 
+		{
+			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "abs", "(D)D");
+		}
+	|	'max' '(' expr ',' expr ')' 
+		{
+			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "max", "(DD)D");
+		}
+	|	'min' '(' expr ',' expr ')' 
+		{
+			mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "min", "(DD)D");
+		} ;
 	
 NUMBER :   '0'..'9'+ ( '.' ('0'..'9'+))?;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.