Skip to content

Commit 027a25c

Browse files
makarchukmakarchuk
authored
Merge branch 'master' into string.__repr__
2 parents 70fb3f6 + 28142e0 commit 027a25c

22 files changed

Lines changed: 336 additions & 144 deletions

‎compiler/src/error.rs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use rustpython_parser::error::{ParseError, ParseErrorType};
1+
use rustpython_parser::error::{LexicalErrorType, ParseError, ParseErrorType};
22
use rustpython_parser::location::Location;
33

44
use std::error::Error;
@@ -40,6 +40,19 @@ pub enum CompileErrorType {
4040
InvalidYield,
4141
}
4242

43+
impl CompileError {
44+
pub fn is_tab_error(&self) -> bool {
45+
if let CompileErrorType::Parse(parse) = &self.error {
46+
if let ParseErrorType::Lexical(lex) = parse {
47+
if let LexicalErrorType::TabError = lex {
48+
return true;
49+
}
50+
}
51+
}
52+
false
53+
}
54+
}
55+
4356
impl fmt::Display for CompileError {
4457
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
4558
match &self.error {

‎parser/src/error.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ pub enum LexicalErrorType {
2020
StringError,
2121
UnicodeError,
2222
NestingError,
23+
TabError,
2324
DefaultArgumentError,
2425
PositionalArgumentError,
2526
DuplicateKeywordArgumentError,
@@ -35,6 +36,9 @@ impl fmt::Display for LexicalErrorType {
3536
LexicalErrorType::FStringError(error) => write!(f, "Got error in f-string: {}", error),
3637
LexicalErrorType::UnicodeError => write!(f, "Got unexpected unicode"),
3738
LexicalErrorType::NestingError => write!(f, "Got unexpected nesting"),
39+
LexicalErrorType::TabError => {
40+
write!(f, "inconsistent use of tabs and spaces in indentation")
41+
}
3842
LexicalErrorType::DefaultArgumentError => {
3943
write!(f, "non-default argument follows default argument")
4044
}

‎parser/src/lexer.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ impl IndentationLevel {
3838
} else {
3939
Err(LexicalError {
4040
location,
41-
error: LexicalErrorType::OtherError(
42-
"inconsistent use of tabs and spaces in indentation".to_string(),
43-
),
41+
error: LexicalErrorType::TabError,
4442
})
4543
}
4644
} else if self.tabs > other.tabs {
@@ -49,9 +47,7 @@ impl IndentationLevel {
4947
} else {
5048
Err(LexicalError {
5149
location,
52-
error: LexicalErrorType::OtherError(
53-
"inconsistent use of tabs and spaces in indentation".to_string(),
54-
),
50+
error: LexicalErrorType::TabError,
5551
})
5652
}
5753
} else {

‎tests/snippets/dict.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,3 +251,6 @@ def __eq__(self, other):
251251
assert isinstance(c, set)
252252
assert c == {'bla', 'c', 'd', 'f'}
253253

254+
assert not {}.__ne__({})
255+
assert {}.__ne__({'a':'b'})
256+
assert {}.__ne__(1) == NotImplemented

‎tests/snippets/invalid_syntax.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,14 @@ def valid_func():
1414
else:
1515
raise AssertionError("Must throw syntax error")
1616

17+
src = """
18+
if True:
19+
pass
20+
\tpass
21+
"""
22+
23+
with assert_raises(TabError):
24+
compile(src, '', 'exec')
25+
1726
with assert_raises(SyntaxError):
1827
compile('0xX', 'test.py', 'exec')

‎tests/snippets/list.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,3 +488,47 @@ def bad_iter_assign():
488488
assert x == [0, 1, 2, 3, 4, 5]
489489
x = list(range(10))
490490
del x[-5:-1:-1]
491+
492+
assert [1, 2].__ne__([])
493+
assert [2, 1].__ne__([1, 2])
494+
assert not [1, 2].__ne__([1, 2])
495+
assert [1, 2].__ne__(1) == NotImplemented
496+
497+
# list gt, ge, lt, le
498+
assert_raises(TypeError, lambda: [0, []] < [0, 0])
499+
assert_raises(TypeError, lambda: [0, []] <= [0, 0])
500+
assert_raises(TypeError, lambda: [0, []] > [0, 0])
501+
assert_raises(TypeError, lambda: [0, []] >= [0, 0])
502+
503+
assert_raises(TypeError, lambda: [0, 0] < [0, []])
504+
assert_raises(TypeError, lambda: [0, 0] <= [0, []])
505+
assert_raises(TypeError, lambda: [0, 0] > [0, []])
506+
assert_raises(TypeError, lambda: [0, 0] >= [0, []])
507+
508+
assert [0, 0] < [1, -1]
509+
assert [0, 0] < [0, 0, 1]
510+
assert [0, 0] < [0, 0, -1]
511+
assert [0, 0] <= [0, 0, -1]
512+
assert not [0, 0, 0, 0] <= [0, -1]
513+
514+
assert [0, 0] > [-1, 1]
515+
assert [0, 0] >= [-1, 1]
516+
assert [0, 0, 0] >= [-1, 1]
517+
518+
assert [0, 0] <= [0, 1]
519+
assert [0, 0] <= [0, 0]
520+
assert [0, 0] <= [0, 0]
521+
assert not [0, 0] > [0, 0]
522+
assert not [0, 0] < [0, 0]
523+
524+
assert not [float('nan'), float('nan')] <= [float('nan'), 1]
525+
assert not [float('nan'), float('nan')] <= [float('nan'), float('nan')]
526+
assert not [float('nan'), float('nan')] >= [float('nan'), float('nan')]
527+
assert not [float('nan'), float('nan')] < [float('nan'), float('nan')]
528+
assert not [float('nan'), float('nan')] > [float('nan'), float('nan')]
529+
530+
assert [float('inf'), float('inf')] >= [float('inf'), 1]
531+
assert [float('inf'), float('inf')] <= [float('inf'), float('inf')]
532+
assert [float('inf'), float('inf')] >= [float('inf'), float('inf')]
533+
assert not [float('inf'), float('inf')] < [float('inf'), float('inf')]
534+
assert not [float('inf'), float('inf')] > [float('inf'), float('inf')]

‎tests/snippets/set.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,3 +327,13 @@ def __hash__(self):
327327
assert x == (EqObject(x) == EqObject(x))
328328
s = {EqObject(x)}
329329
assert EqObject(x) in s
330+
331+
assert set([1, 2]).__ne__(set())
332+
assert not set([1, 2]).__ne__(set([2, 1]))
333+
assert set().__ne__(1) == NotImplemented
334+
335+
assert frozenset([1, 2]).__ne__(set())
336+
assert frozenset([1, 2]).__ne__(frozenset())
337+
assert not frozenset([1, 2]).__ne__(set([2, 1]))
338+
assert not frozenset([1, 2]).__ne__(frozenset([2, 1]))
339+
assert frozenset().__ne__(1) == NotImplemented

‎tests/snippets/strings.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from testutils import assert_raises
22

3+
assert "".__eq__(1) == NotImplemented
34
assert "a" == 'a'
45
assert """a""" == "a"
56
assert len(""" " "" " "" """) == 11
@@ -318,3 +319,8 @@ def try_mutate_str():
318319
assert chr(9999).__repr__() == "'✏'"
319320
assert chr(99999).__repr__() == "'𘚟'"
320321
assert chr(999999).__repr__() == "'\\U000f423f'"
322+
323+
assert "a".__ne__("b")
324+
assert not "a".__ne__("a")
325+
assert not "".__ne__("")
326+
assert "".__ne__(1) == NotImplemented

‎tests/snippets/tuple.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from testutils import assert_raises
2+
13
assert (1,2) == (1,2)
24

35
x = (1,2)
@@ -47,3 +49,45 @@ def __eq__(self, x):
4749
a = ()
4850
b = ()
4951
assert a is b
52+
53+
assert (1,).__ne__((2,))
54+
assert not (1,).__ne__((1,))
55+
56+
# tuple gt, ge, lt, le
57+
assert_raises(TypeError, lambda: (0, ()) < (0, 0))
58+
assert_raises(TypeError, lambda: (0, ()) <= (0, 0))
59+
assert_raises(TypeError, lambda: (0, ()) > (0, 0))
60+
assert_raises(TypeError, lambda: (0, ()) >= (0, 0))
61+
62+
assert_raises(TypeError, lambda: (0, 0) < (0, ()))
63+
assert_raises(TypeError, lambda: (0, 0) <= (0, ()))
64+
assert_raises(TypeError, lambda: (0, 0) > (0, ()))
65+
assert_raises(TypeError, lambda: (0, 0) >= (0, ()))
66+
67+
assert (0, 0) < (1, -1)
68+
assert (0, 0) < (0, 0, 1)
69+
assert (0, 0) < (0, 0, -1)
70+
assert (0, 0) <= (0, 0, -1)
71+
assert not (0, 0, 0, 0) <= (0, -1)
72+
73+
assert (0, 0) > (-1, 1)
74+
assert (0, 0) >= (-1, 1)
75+
assert (0, 0, 0) >= (-1, 1)
76+
77+
assert (0, 0) <= (0, 1)
78+
assert (0, 0) <= (0, 0)
79+
assert (0, 0) <= (0, 0)
80+
assert not (0, 0) > (0, 0)
81+
assert not (0, 0) < (0, 0)
82+
83+
assert not (float('nan'), float('nan')) <= (float('nan'), 1)
84+
assert not (float('nan'), float('nan')) <= (float('nan'), float('nan'))
85+
assert not (float('nan'), float('nan')) >= (float('nan'), float('nan'))
86+
assert not (float('nan'), float('nan')) < (float('nan'), float('nan'))
87+
assert not (float('nan'), float('nan')) > (float('nan'), float('nan'))
88+
89+
assert (float('inf'), float('inf')) >= (float('inf'), 1)
90+
assert (float('inf'), float('inf')) <= (float('inf'), float('inf'))
91+
assert (float('inf'), float('inf')) >= (float('inf'), float('inf'))
92+
assert not (float('inf'), float('inf')) < (float('inf'), float('inf'))
93+
assert not (float('inf'), float('inf')) > (float('inf'), float('inf'))

‎vm/src/builtins.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,8 @@ pub fn make_module(vm: &VirtualMachine, module: PyObjectRef) {
850850
"RuntimeError" => ctx.exceptions.runtime_error.clone(),
851851
"ReferenceError" => ctx.exceptions.reference_error.clone(),
852852
"SyntaxError" => ctx.exceptions.syntax_error.clone(),
853+
"IndentationError" => ctx.exceptions.indentation_error.clone(),
854+
"TabError" => ctx.exceptions.tab_error.clone(),
853855
"NotImplementedError" => ctx.exceptions.not_implemented_error.clone(),
854856
"TypeError" => ctx.exceptions.type_error.clone(),
855857
"ValueError" => ctx.exceptions.value_error.clone(),

0 commit comments

Comments
 (0)