From f58f097151d4914ac5e8859471fca83d3377e23e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 6 Sep 2019 13:19:57 +0200 Subject: [PATCH] Remove scala.tasty.util.Chars Now we should be using scala.internal.Chars --- library/src/scala/tasty/util/Chars.scala | 113 ------------------ .../quoted_1.scala | 2 - .../quoted_1.scala | 2 - 3 files changed, 117 deletions(-) delete mode 100644 library/src/scala/tasty/util/Chars.scala diff --git a/library/src/scala/tasty/util/Chars.scala b/library/src/scala/tasty/util/Chars.scala deleted file mode 100644 index e61d1fc65980..000000000000 --- a/library/src/scala/tasty/util/Chars.scala +++ /dev/null @@ -1,113 +0,0 @@ -package scala.tasty.util - -import scala.annotation.switch -import java.lang.{Character => JCharacter} -import java.lang.Character.LETTER_NUMBER -import java.lang.Character.LOWERCASE_LETTER -import java.lang.Character.OTHER_LETTER -import java.lang.Character.TITLECASE_LETTER -import java.lang.Character.UPPERCASE_LETTER - -/** Contains constants and classifier methods for characters */ -@deprecated("Use scala.internal.Chars", "0.17") -object Chars { - - @deprecated("Use scala.internal.Chars", "0.18") - final val LF = '\u000A' - @deprecated("Use scala.internal.Chars", "0.18") - final val FF = '\u000C' - @deprecated("Use scala.internal.Chars", "0.18") - final val CR = '\u000D' - @deprecated("Use scala.internal.Chars", "0.18") - final val SU = '\u001A' - - /** Convert a character digit to an Int according to given base, - * -1 if no success - */ - @deprecated("Use scala.internal.Chars", "0.18") - def digit2int(ch: Char, base: Int): Int = { - val num = ( - if (ch <= '9') ch - '0' - else if ('a' <= ch && ch <= 'z') ch - 'a' + 10 - else if ('A' <= ch && ch <= 'Z') ch - 'A' + 10 - else -1 - ) - if (0 <= num && num < base) num else -1 - } - /** Buffer for creating '\ u XXXX' strings. */ - private[this] val char2uescapeArray = Array[Char]('\\', 'u', 0, 0, 0, 0) - - /** Convert a character to a backslash-u escape */ - @deprecated("Use scala.internal.Chars", "0.18") - def char2uescape(c: Char): String = { - @forceInline def hexChar(ch: Int): Char = - (( if (ch < 10) '0' else 'A' - 10 ) + ch).toChar - - char2uescapeArray(2) = hexChar((c >> 12) ) - char2uescapeArray(3) = hexChar((c >> 8) % 16) - char2uescapeArray(4) = hexChar((c >> 4) % 16) - char2uescapeArray(5) = hexChar((c ) % 16) - - new String(char2uescapeArray) - } - - /** Is character a line break? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isLineBreakChar(c: Char): Boolean = (c: @switch) match { - case LF|FF|CR|SU => true - case _ => false - } - - /** Is character a whitespace character (but not a new line)? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isWhitespace(c: Char): Boolean = - c == ' ' || c == '\t' || c == CR - - /** Can character form part of a doc comment variable $xxx? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isVarPart(c: Char): Boolean = - '0' <= c && c <= '9' || 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' - - /** Can character start an alphanumeric Scala identifier? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isIdentifierStart(c: Char): Boolean = - (c == '_') || (c == '$') || JCharacter.isUnicodeIdentifierStart(c) - - /** Can character form part of an alphanumeric Scala identifier? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isIdentifierPart(c: Char): Boolean = - (c == '$') || JCharacter.isUnicodeIdentifierPart(c) - - /** Is character a math or other symbol in Unicode? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isSpecial(c: Char): Boolean = { - val chtp = JCharacter.getType(c) - chtp == JCharacter.MATH_SYMBOL.toInt || chtp == JCharacter.OTHER_SYMBOL.toInt - } - - @deprecated("Use scala.internal.Chars", "0.18") - def isValidJVMChar(c: Char): Boolean = - !(c == '.' || c == ';' || c =='[' || c == '/') - - @deprecated("Use scala.internal.Chars", "0.18") - def isValidJVMMethodChar(c: Char): Boolean = - !(c == '.' || c == ';' || c =='[' || c == '/' || c == '<' || c == '>') - - private final val otherLetters = Set[Char]('\u0024', '\u005F') // '$' and '_' - private final val letterGroups = { - import JCharacter._ - Set[Byte](LOWERCASE_LETTER, UPPERCASE_LETTER, OTHER_LETTER, TITLECASE_LETTER, LETTER_NUMBER) - } - @deprecated("Use scala.internal.Chars", "0.18") - def isScalaLetter(ch: Char): Boolean = letterGroups(JCharacter.getType(ch).toByte) || otherLetters(ch) - - /** Can character form part of a Scala operator name? */ - @deprecated("Use scala.internal.Chars", "0.18") - def isOperatorPart(c : Char) : Boolean = (c: @switch) match { - case '~' | '!' | '@' | '#' | '%' | - '^' | '*' | '+' | '-' | '<' | - '>' | '?' | ':' | '=' | '&' | - '|' | '/' | '\\' => true - case c => isSpecial(c) - } -} diff --git a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala index 574fc1e4f3c2..ca421afe4f26 100644 --- a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala @@ -3,8 +3,6 @@ import given scala.quoted.autolift._ import scala.quoted.matching._ -import scala.tasty.util._ - object Macros { implicit inline def testMacro: Unit = ${impl} diff --git a/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala b/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala index 0544cf29dfd6..ebb9c71e4148 100644 --- a/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala +++ b/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala @@ -2,8 +2,6 @@ import scala.quoted._ import scala.quoted.staging._ import given scala.quoted.autolift._ -import scala.tasty.util._ - object Macros { inline def testMacro: Unit = ${impl}