Re: [Tinycc-devel] Dollar Sign in Identifiers Extension

[Ramsay Jones]

On 14/04/15 14:49, Daniel Holden wrote:
> Hi,
> 
> Thanks Ramsay and Sergey, sorry for misunderstanding about the mob branch! 
> Working with git makes everything a lot easier - I was building the patch by 
> hand.
> 
> I've attached a new patch for the mob branch which should work.

The format of the attachment is not suitable for application by
'git am' (or 'git apply' for that matter), without some manual
massaging of the file. However, I managed to whip it into enough
shape to apply and test.

You still have whitespace errors:

  $ git show --check
  commit c6a83478766fcde878219c2587978100c43b2a05
  Author: Daniel Holden <address@hidden>
  Date:   Tue Apr 14 18:21:33 2015 +0100

      Fixed Dollars in Identifiers Patch
      
      Added tests for dollars in identifiers flag and also fixed issue with
      compile flags not being ready at the time of preprocessor
      construction. Added fix for syntax conflict with asm where identifier
      with $ as first character has different meaning.

  tests/tests2/76_dollars_in_identifiers.c:20: trailing whitespace.
  +   
  tests/tests2/76_dollars_in_identifiers.c:23: trailing whitespace.
  +   
  tests/tests2/76_dollars_in_identifiers.c:24: trailing whitespace.
  +   int $ = 10; 
  tests/tests2/76_dollars_in_identifiers.c:30: trailing whitespace.
  +   
  tests/tests2/76_dollars_in_identifiers.c:42: new blank line at EOF.
  $ 

(Note that I didn't manage to keep your commit date!)

However, the patch builds and passes all tests.

After the following:

  $ vim tests/tests2/76_dollars_in_identifiers.c  # fixup whitespace
  $ git diff
  diff --git a/tests/tests2/76_dollars_in_identifiers.c 
b/tests/tests2/76_dollars_in_identifiers.c
  index 48c48fd..c5fcf99 100644
  --- a/tests/tests2/76_dollars_in_identifiers.c
  +++ b/tests/tests2/76_dollars_in_identifiers.c
  @@ -17,17 +17,17 @@ int main()
      printf("fred2=%d\n", $($fred));
      printf("joe2=%d\n", $(joe$));
      printf("henry2=%d\n", $(hen$y));
  -   
  +
      printf("fred10=%d\n", $10($fred));
      printf("joe_10=%d\n", _$10(joe$));
  -   
  -   int $ = 10; 
  +
  +   int $ = 10;
      int a100$ = 100;
      int a$$ = 1000;
      int a$c$b = 2121;
      int $100 = 10000;
      const char *$$$ = "money";
  -   
  +
      printf("local=%d\n", $);
      printf("a100$=%d\n", a100$);
      printf("a$$=%d\n", a$$);
  @@ -39,4 +39,3 @@ int main()
   }
 
   /* vim: set expandtab ts=4 sw=3 sts=3 tw=80 :*/
  -
  $ git diff --check
  $

  $ git add tests/tests2/76_dollars_in_identifiers.c 
  $ git commit --amend
  [daniel e3f4b4e] Fixed Dollars in Identifiers Patch
   Author: Daniel Holden <address@hidden>
   Date: Tue Apr 14 18:21:33 2015 +0100
   6 files changed, 77 insertions(+), 13 deletions(-)
   create mode 100644 tests/tests2/76_dollars_in_identifiers.c
   create mode 100644 tests/tests2/76_dollars_in_identifiers.expect
  $ git show --check
  commit e3f4b4e3c115274b61efafa6bab7171c7d504352
  Author: Daniel Holden <address@hidden>
  Date:   Tue Apr 14 18:21:33 2015 +0100

      Fixed Dollars in Identifiers Patch
    
      Added tests for dollars in identifiers flag and also fixed issue with
      compile flags not being ready at the time of preprocessor
      construction. Added fix for syntax conflict with asm where identifier
      with $ as first character has different meaning.

  $ 

  $ git format-patch -1
  0001-Fixed-Dollars-in-Identifiers-Patch.patch
  $ 

The resulting patch file should (which I've attached) _should_ apply
to the current mob branch (@ commit a13f183), thus:

  $ git checkout -b daniel mob
  Switched to a new branch 'daniel'
  $ git am 0001-Fixed-Dollars-in-Identifiers-Patch.patch
  Applying: Fixed Dollars in Identifiers Patch
  $

HTH

ATB,
Ramsay Jones

0001-Fixed-Dollars-in-Identifiers-Patch.patch
Description: Text Data