整数判定において、先頭が0だったり、文字数が20以上だったらFalseにするように (kyuridenamida#172)

chaemon · kyuridenamida · commit 3c1e33ea69e8 · 2019-12-16T00:31:51.000+09:00
* 整数判定において、先頭が0だったり、文字数が20以上だったらFalseにするように

* answer.txtを変更

* test_mod_caseをstringに
diff --git a/atcodertools/fmtprediction/predict_types.py b/atcodertools/fmtprediction/predict_types.py
@@ -48,7 +48,15 @@ def is_float(text):
 
 
 def is_int(text):
-    return re.match(r"-?\d+$", text) is not None
+    if text == "0":
+        return True
+    if re.match(r"-?\d+$", text) is None:
+        return False
+    if text[0] == "0":
+        return False
+    if len(text) > 19 or (text[0] == '-' and len(text) > 20):
+        return False
+    return True
 
 
 def _convert_to_proper_type(value: str) -> Any:
diff --git a/tests/resources/test_codegen/test_mod_case/cpp/generated_code.txt b/tests/resources/test_codegen/test_mod_case/cpp/generated_code.txt
@@ -2,14 +2,14 @@
 using namespace std;
 
 const int mod = 998244353;
-void solve(long long A, long long B){
+void solve(std::string A, std::string B){
 
 }
 int main(){
-    long long A;
-    scanf("%lld",&A);
-    long long B;
-    scanf("%lld",&B);
+    std::string A;
+    std::cin >> A;
+    std::string B;
+    std::cin >> B;
     solve(A, B);
     return 0;
 }
diff --git a/tests/resources/test_codegen/test_mod_case/cs/generated_code.txt b/tests/resources/test_codegen/test_mod_case/cs/generated_code.txt
@@ -11,14 +11,14 @@ public class Program{
 
     public static void Main(string[] args){
         ConsoleInput cin = new ConsoleInput(Console.In, ' ');
-        long A;
-        A = cin.ReadLong;
-        long B;
-        B = cin.ReadLong;
+        string A;
+        A = cin.Read;
+        string B;
+        B = cin.Read;
         new Program().Solve(A, B);
     }
 
-    public void Solve(long A, long B){
+    public void Solve(string A, string B){
         
     }
 }
diff --git a/tests/resources/test_codegen/test_mod_case/d/generated_code.txt b/tests/resources/test_codegen/test_mod_case/d/generated_code.txt
@@ -5,19 +5,19 @@ import std.string;
 
 immutable long MOD = 998244353;
 
-void solve(long A, long B){
+void solve(string A, string B){
 
 }
 
 int main(){
     auto input = stdin.byLine.map!split.joiner;
 
-    long A;
-    A = input.front.to!long;
+    string A;
+    A = input.front.to!string;
     input.popFront;
 
-    long B;
-    B = input.front.to!long;
+    string B;
+    B = input.front.to!string;
     input.popFront;
 
     solve(A, B);
diff --git a/tests/resources/test_codegen/test_mod_case/intermediate_types.txt b/tests/resources/test_codegen/test_mod_case/intermediate_types.txt
@@ -1 +1 @@
-[('A', <class 'int'>), ('B', <class 'int'>)]
+[('A', <class 'str'>), ('B', <class 'str'>)]
diff --git a/tests/resources/test_codegen/test_mod_case/java/generated_code.txt b/tests/resources/test_codegen/test_mod_case/java/generated_code.txt
@@ -5,14 +5,14 @@ class Main {
     static final int mod = 998244353;
     public static void main(String[] args) throws Exception {
         final Scanner sc = new Scanner(System.in);
-        long A;
-        A = sc.nextLong();
-        long B;
-        B = sc.nextLong();
+        String A;
+        A = sc.next();
+        String B;
+        B = sc.next();
         solve(A, B);
     }
 
-    static void solve(long A, long B){
+    static void solve(String A, String B){
 
     }
 }
diff --git a/tests/resources/test_codegen/test_mod_case/nim/generated_code.txt b/tests/resources/test_codegen/test_mod_case/nim/generated_code.txt
@@ -16,14 +16,14 @@ proc nextString(): string =
 
 let MOD = 998244353
 
-proc solve(A:int, B:int):void =
+proc solve(A:string, B:string):void =
   return
 
 proc main():void =
-  var A = 0
-  A = nextInt()
-  var B = 0
-  B = nextInt()
+  var A = ""
+  A = nextString()
+  var B = ""
+  B = nextString()
   solve(A, B)
   return
 
diff --git a/tests/resources/test_codegen/test_mod_case/python/generated_code.txt b/tests/resources/test_codegen/test_mod_case/python/generated_code.txt
@@ -4,7 +4,7 @@ import sys
 MOD = 998244353  # type: int
 
 
-def solve(A: int, B: int):
+def solve(A: str, B: str):
     return
 
 
@@ -14,8 +14,8 @@ def main():
             for word in line.split():
                 yield word
     tokens = iterate_tokens()
-    A = int(next(tokens))  # type: int
-    B = int(next(tokens))  # type: int
+    A = next(tokens)  # type: str
+    B = next(tokens)  # type: str
     solve(A, B)
 
 if __name__ == '__main__':
diff --git a/tests/resources/test_codegen/test_mod_case/rust/generated_code.txt b/tests/resources/test_codegen/test_mod_case/rust/generated_code.txt
@@ -1,16 +1,16 @@
 use std::*;
 
 const MOD: i64 = 998244353;
-fn solve(A: i64, B: i64) {
+fn solve(A: String, B: String) {
 
 }
 
 fn main() {
     let con = read_string();
     let mut scanner = Scanner::new(&con);
-    let mut A: i64;
+    let mut A: String;
     A = scanner.next();
-    let mut B: i64;
+    let mut B: String;
     B = scanner.next();
     solve(A, B);
 }
diff --git a/tests/resources/test_fmtprediction/answer.txt b/tests/resources/test_fmtprediction/answer.txt

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ public class Program{`
`11`	`11`
`12`	`12`	`public static void Main(string[] args){`
`13`	`13`	`ConsoleInput cin = new ConsoleInput(Console.In, ' ');`
`14`		`- long A;`
`15`		`- A = cin.ReadLong;`
`16`		`- long B;`
`17`		`- B = cin.ReadLong;`
	`14`	`+ string A;`
	`15`	`+ A = cin.Read;`
	`16`	`+ string B;`
	`17`	`+ B = cin.Read;`
`18`	`18`	`new Program().Solve(A, B);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public void Solve(long A, long B){`
	`21`	`+ public void Solve(string A, string B){`
`22`	`22`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[('A', <class 'int'>), ('B', <class 'int'>)]`
	`1`	`+[('A', <class 'str'>), ('B', <class 'str'>)]`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,14 @@ class Main {`
`5`	`5`	`static final int mod = 998244353;`
`6`	`6`	`public static void main(String[] args) throws Exception {`
`7`	`7`	`final Scanner sc = new Scanner(System.in);`
`8`		`- long A;`
`9`		`- A = sc.nextLong();`
`10`		`- long B;`
`11`		`- B = sc.nextLong();`
	`8`	`+ String A;`
	`9`	`+ A = sc.next();`
	`10`	`+ String B;`
	`11`	`+ B = sc.next();`
`12`	`12`	`solve(A, B);`
`13`	`13`	`}`
`14`	`14`
`15`		`- static void solve(long A, long B){`
	`15`	`+ static void solve(String A, String B){`
`16`	`16`
`17`	`17`	`}`
`18`	`18`	`}`