py/repl: Check for an identifier char after the keyword.

Alex March · dpgeorge · commit 69d9e7d27d62 · 2016-02-17T08:56:15.000Z
- As described in the adafruit#1850. - Add cmdline tests.
diff --git a/py/misc.h b/py/misc.h
@@ -123,6 +123,7 @@ bool unichar_isalpha(unichar c);
 bool unichar_isprint(unichar c);
 bool unichar_isdigit(unichar c);
 bool unichar_isxdigit(unichar c);
+bool unichar_isident(unichar c);
 bool unichar_isupper(unichar c);
 bool unichar_islower(unichar c);
 unichar unichar_tolower(unichar c);
diff --git a/py/repl.c b/py/repl.c
@@ -38,7 +38,7 @@ STATIC bool str_startswith_word(const char *str, const char *head) {
             return false;
         }
     }
-    return head[i] == '\0' && (str[i] == '\0' || !unichar_isalpha(str[i]));
+    return head[i] == '\0' && (str[i] == '\0' || !unichar_isident(str[i]));
 }
 
 bool mp_repl_continue_with_input(const char *input) {
diff --git a/py/unicode.c b/py/unicode.c
@@ -145,11 +145,9 @@ bool unichar_isxdigit(unichar c) {
     return c < 128 && (attr[c] & FL_XDIGIT) != 0;
 }
 
-/*
-bool unichar_is_alpha_or_digit(unichar c) {
-    return c < 128 && (attr[c] & (FL_ALPHA | FL_DIGIT)) != 0;
+bool unichar_isident(unichar c) {
+    return c < 128 && ((attr[c] & (FL_ALPHA | FL_DIGIT)) != 0 || c == '_');
 }
-*/
 
 bool unichar_isupper(unichar c) {
     return c < 128 && (attr[c] & FL_UPPER) != 0;
diff --git a/tests/cmdline/repl_cont.py b/tests/cmdline/repl_cont.py
@@ -29,3 +29,6 @@ def f(x):
 print(x)
 
 f(3)
+if1=1
+if1 = 2
+print(if1)
diff --git a/tests/cmdline/repl_cont.py.exp b/tests/cmdline/repl_cont.py.exp
@@ -50,4 +50,8 @@ two
 ...     [K
 >>> f(3)
 3
+>>> if1=1
+>>> if1 = 2
+>>> print(if1)
+2
 >>> 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ STATIC bool str_startswith_word(const char str, const char head) {`
`38`	`38`	`return false;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`- return head[i] == '\0' && (str[i] == '\0' \|\| !unichar_isalpha(str[i]));`
	`41`	`+ return head[i] == '\0' && (str[i] == '\0' \|\| !unichar_isident(str[i]));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`bool mp_repl_continue_with_input(const char *input) {`
Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,9 @@ bool unichar_isxdigit(unichar c) {`
`145`	`145`	`return c < 128 && (attr[c] & FL_XDIGIT) != 0;`
`146`	`146`	`}`
`147`	`147`
`148`		`-/*`
`149`		`-bool unichar_is_alpha_or_digit(unichar c) {`
`150`		`- return c < 128 && (attr[c] & (FL_ALPHA \| FL_DIGIT)) != 0;`
	`148`	`+bool unichar_isident(unichar c) {`
	`149`	`+ return c < 128 && ((attr[c] & (FL_ALPHA \| FL_DIGIT)) != 0 \|\| c == '_');`
`151`	`150`	`}`
`152`		`-*/`
`153`	`151`
`154`	`152`	`bool unichar_isupper(unichar c) {`
`155`	`153`	`return c < 128 && (attr[c] & FL_UPPER) != 0;`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,8 @@ two`
`50`	`50`	`... [K`
`51`	`51`	`>>> f(3)`
`52`	`52`	`3`
	`53`	`+>>> if1=1`
	`54`	`+>>> if1 = 2`
	`55`	`+>>> print(if1)`
	`56`	`+2`
`53`	`57`	`>>>`