# HG changeset patch
# User Frits van Bommel <fvbommel wxs.nl>
# Date 1236656934 -3600
# Node ID 44d1c557a07bfa0248d9fba7dbb17f007bb51685
# Parent  9c63438c320746b54555c7de040c290cfe9daf9b# Parent  4e388d9d0e25ad50b9849b2d0766833290c417c0
Automated merge with http://hg.dsource.org/projects/ldc

diff -r 4e388d9d0e25 -r 44d1c557a07b gen/asm-x86-64.h
--- a/gen/asm-x86-64.h	Tue Mar 10 04:45:32 2009 +0100
+++ b/gen/asm-x86-64.h	Tue Mar 10 04:48:54 2009 +0100
@@ -1499,7 +1499,15 @@
                 }
 
                 if ( token->value == TOKcomma )
+                {
                     nextToken();
+                }
+                else if ( token->value == TOKint16 || token->value == TOKint32 || token->value == TOKint64 )
+                {
+                    //throw away the 'short' in "jle short Label;". Works for long also.
+                    operands[0] = operands[1];
+                    return;
+                }
                 else if ( token->value != TOKeof )
                 {
                     ok = false;
@@ -2911,6 +2919,12 @@
                     ident = Id::__dollar;
                     goto do_dollar;
                     break;
+                case TOKint16:
+                case TOKint32:
+                case TOKint64:
+                    //This is for the 'short' in "jle short Label;"
+                    return Handled;
+                    break;
                 default:
                     invalidExpression();
                     return Handled;