• Ingo Oeser (60/60) Jul 22 2007 Hi there,
• alex (17/18) Jul 22 2007 I get this problem when patching :
• Ingo Oeser (13/15) Jul 23 2007 Hmm, you are right! GNU patch goofed up with the patches generated by

Ingo Oeser <ioe-news rameria.de> writes:

Hi there,

I just ported Gregors patch for DMD 1.018 to the latest SVN (r132).

http://sourceforge.net/tracker/index.php?func=detail&aid=1758462&group_id=154306&atid=791254
http://sourceforge.net/tracker/index.php?func=detail&aid=1758462&group_id=154306&atid=791254
Changes:
- Manually fixed up all rejects this time
  -> Fixes already applied and doubly applied hunks
  -> Now frontend and phobos really don't differ anymore

- Generated with ignoring line endings
  -> saves one step until David fixes line endings in SVN.

So now things should work out much better.
All testers welcome!

Best Regards

Ingo Oeser

,----[ diffstat ]
|  ChangeLog                |  207
|  +++++++++++++++++++++++++++++++++++++++++++++++
|  dmd/attrib.c             |    1
|  dmd/class.c              |    2
|  dmd/constfold.c          |    1
|  dmd/declaration.c        |    6 +
|  dmd/dsymbol.c            |   12 ++
|  dmd/expression.c         |  143 +++++++++++++++++++++++++++++---
|  dmd/expression.h         |    7 +
|  dmd/func.c               |   24 +++--
|  dmd/hdrgen.h             |    1
|  dmd/idgen.c              |    5 +
|  dmd/init.c               |   41 +++++++++
|  dmd/init.h               |    5 +
|  dmd/inline.c             |   22 ++++
|  dmd/interpret.c          |   70 +++++++++++++--
|  dmd/lexer.c              |   52 ++++++++++-
|  dmd/mars.c               |    4
|  dmd/mars.h               |    1
|  dmd/module.c             |    1
|  dmd/mtype.c              |   46 +++++-----
|  dmd/mtype.h              |    1
|  dmd/optimize.c           |    9 ++
|  dmd/parse.c              |   13 +-
|  dmd/scope.c              |   37 +++++++-
|  dmd/scope.h              |    1
|  dmd/statement.c          |   79 ++++++++++++-----
|  dmd/statement.h          |    3
|  dmd/staticassert.c       |   12 +-
|  dmd/template.c           |   10 +-
|  phobos/internal/object.d |   28 ++++++
|  phobos/object.d          |   13 ++
|  phobos/std/bind.d        |    2
|  phobos/std/compiler.d    |    6 -
|  phobos/std/date.d        |    3
|  phobos/std/dateparse.d   |    2
|  phobos/std/format.d      |   12 +-
|  phobos/std/intrinsic.d   |   26 +++--
|  phobos/std/math2.d       |    3
|  phobos/std/metastrings.d |   16 ++-
|  phobos/std/outbuffer.d   |    5 -
|  phobos/std/string.d      |   62 ++++++++------
|  phobos/win32.mak         |   32 +++----
|  42 files changed, 842 insertions(+), 184 deletions(-)
`----

alex <alex.pia bluelab.net> writes:

Ingo Oeser wrote:

 All testers welcome!

I get this problem when patching :

alex musashi:~/dwork/dgcc$ patch -p0 <../gdc-r132-GregorR-dmd-1.018.patch
patching file d/phobos/object.d
patching file d/phobos/std/metastrings.d
patching file d/phobos/std/intrinsic.d
patching file d/phobos/std/string.d
patching file d/phobos/std/dateparse.d
patching file d/phobos/std/math2.d
patching file d/phobos/std/outbuffer.d
patching file d/phobos/std/compiler.d
patching file d/phobos/std/bind.d
patching file d/phobos/std/date.d
patching file d/phobos/std/format.d
patch: **** malformed patch at line 460:    -1100,7 +1099,6   

I can't get it to work. I have the right rev of gdc and I tried with and 
without fixing line endings.

Ingo Oeser <ioe-news rameria.de> writes:

Hi Alex,

alex wrote:
 I can't get it to work. I have the right rev of gdc and I tried with and
 without fixing line endings.

Hmm, you are right! GNU patch goofed up with the patches generated by
svn. 

Ok, David was kind enough to merge DMD 1.018 :-)
So my patch is obsolete now.

THANKS DAVID!

I wish these line ending issues would be tackled one day :-)


Many thanks for going through this with me, Alex.

Now trying to get progress on GCC 4.2 compile.
This will take some time.


Best Regards and thanks again!

Ingo Oeser