@@ -567,11 +567,36 @@ class TestTokenizer : public TestFixture {
567567 ASSERT_EQUALS("; x = ( a + m ) & p [ n ] ;", tokenizeAndStringify("; x = ( a + m ) & p [ n ] ;", true));*/
568568 // "*(p+1)" => "p[1]"
569569 ASSERT_EQUALS (" ; x = p [ 1 ] ;" , tokenizeAndStringify (" ; x = * ( p + 1 ) ;" , true ));
570+ ASSERT_EQUALS (" ; x = p [ 10 ] ;" , tokenizeAndStringify (" ; x = * ( p + 0xA ) ;" , true ));
570571 ASSERT_EQUALS (" ; x = p [ n ] ;" , tokenizeAndStringify (" ; x = * ( p + n ) ;" , true ));
571572 ASSERT_EQUALS (" ; x = y * ( p + n ) ;" , tokenizeAndStringify (" ; x = y * ( p + n ) ;" , true ));
572573 ASSERT_EQUALS (" ; x = 10 * ( p + n ) ;" , tokenizeAndStringify (" ; x = 10 * ( p + n ) ;" , true ));
573574 ASSERT_EQUALS (" ; x = y [ 10 ] * ( p + n ) ;" , tokenizeAndStringify (" ; x = y [ 10 ] * ( p + n ) ;" , true ));
574575 ASSERT_EQUALS (" ; x = ( a + m ) * ( p + n ) ;" , tokenizeAndStringify (" ; x = ( a + m ) * ( p + n ) ;" , true ));
576+
577+ // "*(p-1)" => "p[-1]" and "*(p-n)" => "p[-n]"
578+ ASSERT_EQUALS (" ; x = p [ -1 ] ;" , tokenizeAndStringify (" ; x = *(p - 1);" , true ));
579+ ASSERT_EQUALS (" ; x = p [ -10 ] ;" , tokenizeAndStringify (" ; x = *(p - 0xA);" , true ));
580+ ASSERT_EQUALS (" ; x = p [ - n ] ;" , tokenizeAndStringify (" ; x = *(p - n);" , true ));
581+ ASSERT_EQUALS (" ; x = y * ( p - 1 ) ;" , tokenizeAndStringify (" ; x = y * (p - 1);" , true ));
582+ ASSERT_EQUALS (" ; x = 10 * ( p - 1 ) ;" , tokenizeAndStringify (" ; x = 10 * (p - 1);" , true ));
583+ ASSERT_EQUALS (" ; x = y [ 10 ] * ( p - 1 ) ;" , tokenizeAndStringify (" ; x = y[10] * (p - 1);" , true ));
584+ ASSERT_EQUALS (" ; x = ( a - m ) * ( p - n ) ;" , tokenizeAndStringify (" ; x = (a - m) * (p - n);" , true ));
585+
586+ // Test that the array-index simplification is not applied when there's no dereference:
587+ // "(x-y)" => "(x-y)" and "(x+y)" => "(x+y)"
588+ ASSERT_EQUALS (" ; a = b * ( x - y ) ;" , tokenizeAndStringify (" ; a = b * (x - y);" , true ));
589+ ASSERT_EQUALS (" ; a = b * x [ - y ] ;" , tokenizeAndStringify (" ; a = b * *(x - y);" , true ));
590+ ASSERT_EQUALS (" ; a = a * ( x - y ) ;" , tokenizeAndStringify (" ; a *= (x - y);" , true ));
591+ ASSERT_EQUALS (" ; z = a ++ * ( x - y ) ;" , tokenizeAndStringify (" ; z = a++ * (x - y);" , true ));
592+ ASSERT_EQUALS (" ; z = a ++ * ( x + y ) ;" , tokenizeAndStringify (" ; z = a++ * (x + y);" , true ));
593+ ASSERT_EQUALS (" ; z = a -- * ( x - y ) ;" , tokenizeAndStringify (" ; z = a-- * (x - y);" , true ));
594+ ASSERT_EQUALS (" ; z = a -- * ( x + y ) ;" , tokenizeAndStringify (" ; z = a-- * (x + y);" , true ));
595+ ASSERT_EQUALS (" ; z = 'a' * ( x - y ) ;" , tokenizeAndStringify (" ; z = 'a' * (x - y);" , true ));
596+ ASSERT_EQUALS (" ; z = \" a\" * ( x - y ) ;" , tokenizeAndStringify (" ; z = \" a\" * (x - y);" , true ));
597+ ASSERT_EQUALS (" ; z = 'a' * ( x + y ) ;" , tokenizeAndStringify (" ; z = 'a' * (x + y);" , true ));
598+ ASSERT_EQUALS (" ; z = \" a\" * ( x + y ) ;" , tokenizeAndStringify (" ; z = \" a\" * (x + y);" , true ));
599+ ASSERT_EQUALS (" ; z = foo ( ) * ( x + y ) ;" , tokenizeAndStringify (" ; z = foo() * (x + y);" , true ));
575600 }
576601
577602 void tokenize7 () {
0 commit comments