Renamed some symbols for consistency

Author: Juanjo Alvarez

bblfsh/__init__.py

@@ -1,2 +1,2 @@
 from bblfsh.client import BblfshClient
-from bblfsh.pyuast import find
+from bblfsh.pyuast import filter

bblfsh/__main__.py

@@ -1,7 +1,7 @@
 import argparse
 import sys
 
-from bblfsh.pyuast import find
+from bblfsh.pyuast import filter
 
 from bblfsh.client import BblfshClient
 from bblfsh.launcher import ensure_bblfsh_is_running
@@ -29,7 +29,7 @@ def setup():
     return args
 
 def run_query(root, query, mapn, as_array):
-    result = find(root, query)
+    result = filter(root, query)
 
     if not result:
         print("Nothing found")

bblfsh/pyuast.c

@@ -23,22 +23,22 @@ static int ReadLen(const void *data, const char *prop)
   return PySequence_Size(children_obj);
 }
 
-static const char *GetInternalType(const void *node)
+static const char *InternalType(const void *node)
 {
   return ReadStr(node, "internal_type");
 }
 
-static const char *GetToken(const void *node)
+static const char *Token(const void *node)
 {
   return ReadStr(node, "token");
 }
 
-static int GetChildrenSize(const void *node)
+static int ChildrenSize(const void *node)
 {
   return ReadLen(node, "children");
 }
 
-static void *GetChild(const void *data, int index)
+static void *ChildAt(const void *data, int index)
 {
   PyObject *node = (PyObject *)data;
   PyObject *children_obj = PyObject_GetAttrString(node, "children");
@@ -49,12 +49,12 @@ static void *GetChild(const void *data, int index)
   return PyList_GET_ITEM(seq, index);
 }
 
-static int GetRolesSize(const void *node)
+static int RolesSize(const void *node)
 {
   return ReadLen(node, "roles");
 }
 
-static uint16_t GetRoleAt(const void *data, int index)
+static uint16_t RoleAt(const void *data, int index)
 {
   PyObject *node = (PyObject *)data;
   PyObject *roles_obj = PyObject_GetAttrString(node, "roles");
@@ -64,7 +64,7 @@ static uint16_t GetRoleAt(const void *data, int index)
   return (uint16_t)PyLong_AsUnsignedLong(PyList_GET_ITEM(seq, index));
 }
 
-static int GetPropertiesSize(const void *data)
+static int PropertiesSize(const void *data)
 {
   PyObject *node = (PyObject *)data;
   PyObject *properties_obj = PyObject_GetAttrString(node, "properties");
@@ -74,7 +74,7 @@ static int GetPropertiesSize(const void *data)
   return (int)PyLong_AsLong(properties_obj);
 }
 
-static const char *GetPropertyAt(const void *data, int index)
+static const char *PropertyAT(const void *data, int index)
 {
   PyObject *node = (PyObject *)data;
   PyObject *properties_obj = PyObject_GetAttrString(node, "properties");
@@ -91,7 +91,7 @@ static Uast *ctx;
 /////////// PYTHON API //////////////
 /////////////////////////////////////
 
-static PyObject *PyFind(PyObject *self, PyObject *args)
+static PyObject *PyFilter(PyObject *self, PyObject *args)
 {
   PyObject *obj = NULL;
   const char *query = NULL;
@@ -116,7 +116,7 @@ static PyObject *PyFind(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef extension_methods[] = {
-    {"find", PyFind, METH_VARARGS, "Find a node in the UAST"},
+    {"filter", PyFilter, METH_VARARGS, "Filter nodes in the UAST using the given query"},
     {NULL, NULL, 0, NULL}
 };
 
@@ -135,14 +135,14 @@ static struct PyModuleDef module_def = {
 PyMODINIT_FUNC PyInit_pyuast(void)
 {
   NodeIface iface = {
-    .InternalType = GetInternalType,
-    .Token = GetToken,
-    .ChildrenSize = GetChildrenSize,
-    .ChildAt = GetChild,
-    .RolesSize = GetRolesSize,
-    .RoleAt = GetRoleAt,
-    .PropertiesSize = GetPropertiesSize,
-    .PropertyAt = GetPropertyAt,
+    .InternalType = InternalType,
+    .Token = Token,
+    .ChildrenSize = ChildrenSize,
+    .ChildAt = ChildAt,
+    .RolesSize = RolesSize,
+    .RoleAt = RoleAt,
+    .PropertiesSize = PropertiesSize,
+    .PropertyAt = PropertyAT,
   };
 
   ctx = UastNew(iface);

bblfsh/test.py

@@ -2,7 +2,7 @@
 
 import docker
 
-from bblfsh import BblfshClient, find
+from bblfsh import BblfshClient, filter
 from bblfsh.github.com.bblfsh.sdk.protocol.generated_pb2 import ParseResponse
 from github.com.bblfsh.sdk.uast.generated_pb2 import Node
 from bblfsh.launcher import ensure_bblfsh_is_running
@@ -37,13 +37,13 @@ def testUASTFileContents(self):
             contents = fin.read()
         uast = self.client.parse("file.py", contents=contents)
         self._validate_uast(uast)
-        self._validate_find(uast)
+        self._validate_filter(uast)
 
-    def testBrokenFind(self):
+    def testBrokenFilter(self):
         from sys import version_info
         if version_info[0:2] != (3, 4):
             # Skip test 3.4: cant capture SystemException from binary modules
-            self.assertRaises(SystemError, find, 0, "foo")
+            self.assertRaises(SystemError, filter, 0, "foo")
 
     def _validate_uast(self, uast):
         self.assertIsNotNone(uast)
@@ -53,8 +53,8 @@ def _validate_uast(self, uast):
         self.assertEqual(len(uast.errors), 0)
         self.assertIsInstance(uast.uast, Node)
 
-    def _validate_find(self, uast):
-        results = find(uast.uast, "//Import[@roleImportDeclaration]//alias")
+    def _validate_filter(self, uast):
+        results = filter(uast.uast, "//Import[@roleImportDeclaration]//alias")
         self.assertEqual(len(results), 2)
         self.assertEqual(results[0].token, "unittest")
         self.assertEqual(results[1].token, "docker")