Added 'in' and 'not in' operators

Author: dmitrii-eremin

pythonlua/cmpopdesc.py

@@ -12,4 +12,10 @@ class CompareOperationDesc:
         ast.LtE: "<=",
         ast.Gt: ">",
         ast.GtE: ">=",
+        ast.In: {
+            "format": "operator_in({left}, {right})",
+        },
+        ast.NotIn: {
+            "format": "not operator_in({left}, {right})",
+        },
     }

pythonlua/luainit.lua

@@ -70,6 +70,9 @@ local function list(t)
             return v
         end,
     })
+
+    t.is_list = true
+
     return t
 end
 
@@ -94,6 +97,8 @@ function dict(t)
             return key_index
         end,
     })
+
+    t.is_dict = true
 
     return t
 end
@@ -122,6 +127,20 @@ local function staticmethod(old_fun)
     return wrapper
 end
 
+local function operator_in(item, items)
+    if type(items) == "table" then
+        for v in items do
+            if v == item then
+                return true
+            end
+        end
+    elseif type(items) == "string" and type(item) == "string" then
+        return string.find(items, item, 1, true) ~= nil
+    end
+
+    return false
+end
+
 -- Lua classes
 local function class(class_init, bases)
     bases = bases or {}
@@ -168,4 +187,5 @@ local function class(class_init, bases)
 end
 --[[
     End of the lua pythonization.
---]]
+--]]
+

pythonlua/nodevisitor.py

@@ -147,10 +147,14 @@ def visit_Compare(self, node):
 
             values = {
                 "left": left,
-                "op": operation,
                 "right": right,
             }
-            line += "{left} {op} {right}".format(**values)
+
+            if isinstance(operation, str):
+                values["op"] = operation
+                line += "{left} {op} {right}".format(**values)
+            elif isinstance(operation, dict):
+                line += operation["format"].format(**values)
 
             if i < len(node.ops) - 1:
                 left = right

tests/in.py

@@ -0,0 +1,20 @@
+a = [1, 2, 3, 4]
+b = {
+    "name": "John",
+    "age": 42,
+}
+
+c = "Hello, world!"
+
+if 2 < 3:
+    print("2 < 3")
+
+print(1 in a)
+print(2 in a)
+print(5 in a)
+print("name" in b)
+print("surname" in b)
+print("Hell" in c)
+print("world" in c)
+print("Foo" in c)
+print("Hells" not in c)

tests/in.py.expected

@@ -0,0 +1,10 @@
+2 < 3
+true
+true
+false
+true
+false
+true
+true
+false
+true