improve Haxe 4.3 support

vegardit · May 6, 2023 · 8543c18 · 8543c18
1 parent 561d64d
commit 8543c18
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/hx/strings/CharIterator.hx b/src/hx/strings/CharIterator.hx
@@ -110,7 +110,7 @@ class CharIterator {
       return new CharPos(index, line, col);
 
 
-   function new(prevBufferSize:Int)
+   inline function new(prevBufferSize:Int)
       prevBuffer = prevBufferSize > 0 ? new RingBuffer<CharWithPos>(prevBufferSize + 1 /*currChar*/) : null;
 
 
@@ -124,7 +124,7 @@ class CharIterator {
     *
     * @throws haxe.io.Eof if no previous character is available
     */
-   public function prev():Char {
+   public final function prev():Char {
       if (!hasPrev())
          throw new Eof();
 
@@ -150,8 +150,7 @@ class CharIterator {
     *
     * @throws haxe.io.Eof if no more characters are available
     */
-   @:final
-   public function next():Char {
+   public final function next():Char {
       if (prevBufferNextIdx > -1) {
          var prevChar = @:nullSafety(Off) prevBuffer[prevBufferNextIdx];
          currChar = prevChar.char;

diff --git a/src/hx/strings/Pattern.hx b/src/hx/strings/Pattern.hx
@@ -227,7 +227,7 @@ interface Matcher {
  *
  * @author Sebastian Thomschke, Vegard IT GmbH
  */
-@:enum
+#if (haxe_ver < 4.3) @:enum #else enum #end
 abstract MatchingOption(String) {
 
    /**

diff --git a/src/hx/strings/Strings.hx b/src/hx/strings/Strings.hx
@@ -4333,7 +4333,7 @@ class StringDiff {
 /**
  * Specifies the default value to be used if a given substring was not found in a string operation
  */
-@:enum
+#if (haxe_ver < 4.3) @:enum #else enum #end
 abstract StringNotFoundDefault(Int) {
 
    /**

diff --git a/src/hx/strings/ansi/AnsiColor.hx b/src/hx/strings/ansi/AnsiColor.hx
@@ -5,7 +5,7 @@
  */
 package hx.strings.ansi;
 
-@:enum
+#if (haxe_ver < 4.3) @:enum #else enum #end
 abstract AnsiColor(Int) {
    final BLACK = 0;
    final RED = 1;

diff --git a/src/hx/strings/ansi/AnsiTextAttribute.hx b/src/hx/strings/ansi/AnsiTextAttribute.hx
@@ -8,7 +8,7 @@ package hx.strings.ansi;
 /**
  * https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_codes
  */
-@:enum
+#if (haxe_ver < 4.3) @:enum #else enum #end
 abstract AnsiTextAttribute(Int) {
 
    /**

diff --git a/src/hx/strings/internal/TriState.hx b/src/hx/strings/internal/TriState.hx
@@ -8,7 +8,7 @@ package hx.strings.internal;
 /**
  * <b>IMPORTANT:</b> This class it not part of the API. Direct usage is discouraged.
  */
-@:enum
+#if (haxe_ver < 4.3) @:enum #else enum #end
 abstract TriState(Null<Bool>) from Null<Bool> to Null<Bool> {
    final TRUE = true;
    final FALSE = false;