current.diff 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. 0a1
  2. > {$IFNDEF FPC_DOTTEDUNITS}
  3. 1a3
  4. > {$ENDIF FPC_DOTTEDUNITS}
  5. 67c69
  6. < {$I regexpr_compilers.inc}
  7. ---
  8. >
  9. 72d73
  10. < {$IFDEF FPC}
  11. 75c76
  12. < {$ENDIF}
  13. ---
  14. > {$DEFINE COMPAT}
  15. 77c78
  16. < {$DEFINE UnicodeRE} // Use WideChar for characters and UnicodeString/WideString for strings
  17. ---
  18. > { off $DEFINE UnicodeRE} // Use WideChar for characters and UnicodeString/WideString for strings
  19. 79,89c80,83
  20. < { off $DEFINE UseWordChars} // Use WordChars property, otherwise fixed list 'a'..'z','A'..'Z','0'..'9','_'
  21. < { off $DEFINE UseSpaceChars} // Use SpaceChars property, otherwise fixed list
  22. < { off $DEFINE UseLineSep} // Use LineSeparators property, otherwise fixed line-break chars
  23. < {$IFDEF UNICODE}
  24. < {$IFNDEF UnicodeRE}
  25. < {$MESSAGE ERROR 'You cannot undefine UnicodeRE for Unicode Delphi versions'}
  26. < {$ENDIF}
  27. < {$ENDIF}
  28. < {$IFDEF FPC}
  29. < {$DEFINE FastUnicodeData} // Use arrays for UpperCase/LowerCase/IsWordChar, they take 320K more memory
  30. < {$ENDIF}
  31. ---
  32. > {$DEFINE UseWordChars} // Use WordChars property, otherwise fixed list 'a'..'z','A'..'Z','0'..'9','_'
  33. > {$DEFINE UseSpaceChars} // Use SpaceChars property, otherwise fixed list
  34. > {$DEFINE UseLineSep} // Use LineSeparators property, otherwise fixed line-break chars
  35. > { off $DEFINE FastUnicodeData} // Use arrays for UpperCase/LowerCase/IsWordChar, they take 320K more memory
  36. 116d109
  37. <
  38. 121a115,127
  39. >
  40. > {$IFDEF FPC_DOTTEDUNITS}
  41. > uses
  42. > System.SysUtils, // Exception
  43. > {$IFDEF D2009}
  44. > {$IFDEF D_XE2}
  45. > System.System.Character,
  46. > {$ELSE}
  47. > System.Character,
  48. > {$ENDIF}
  49. > {$ENDIF}
  50. > System.Classes; // TStrings in Split method
  51. > {$ELSE FPC_DOTTEDUNITS}
  52. 131a138
  53. > {$ENDIF FPC_DOTTEDUNITS}
  54. 2922d2928
  55. <
  56. 3110d3115
  57. <
  58. 6535d6539
  59. <
  60. 6543a6548
  61. >