Merge pull request #50 from juanjux/feature/iterator

UAST Iterators for PreOrder/LevelOrder/PostOrder traversal

CMakeLists.txt

@@ -1,25 +1,24 @@
 cmake_minimum_required (VERSION 2.6)
 cmake_policy(SET CMP0048 NEW)
-project (LIBUAST
-  VERSION 0.0.0
-  LANGUAGES C)
+project (LIBUAST VERSION 0.0.0 LANGUAGES CXX C)
+
+set (CMAKE_CXX_STANDARD 11)
 
-set(CMAKE_C_STANDARD 99)
 set(CMAKE_MACOSX_RPATH ON)  # fixes CMP0042
 
 set(OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/lib")
 
 # Required dependencies
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-find_package (CUnit REQUIRED)
+find_package(CUnit REQUIRED)
 find_package(LibXml2 REQUIRED)
 
 # Library name
 set(libname uast)
 
 # Source files
 set(libsrc
-  ${CMAKE_SOURCE_DIR}/src/uast.c
+  ${CMAKE_SOURCE_DIR}/src/uast.cc
   ${CMAKE_SOURCE_DIR}/src/roles.c)
 
 # Header files

README.md

@@ -21,7 +21,7 @@ More features may be implemented in the future, like UAST iterators.
 #### Ubuntu instructions
 
 ```
-sudo apt install cmake libxml2 libxml2-dev libcunit1 libcunit1-dev
+sudo apt install build-essential cmake libxml2 libxml2-dev libcunit1 libcunit1-dev
 ```
 
 
@@ -164,6 +164,24 @@ if (nodes) {
 NodesFree(nodes);
 ```
 
+#### UAST Iterators
+
+The API provides a UASTIterator type that can iterate over the UAST in
+pre-order, post-order or level-order.
+
+Example:
+
+```c
+UastIterator *iter = UastIteratorNew(ctx, node, PRE_ORDER);
+
+void *curNode = NULL;
+while((curNode = UastIteratorNext(iter)) != NULL) {
+  // ... do something with the node
+}
+
+UastIteratorFree(iter);
+```
+
 ## Contribute
 
 Please follow [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html).

src/testing_tools.c → src/testing_tools.cc

@@ -2,32 +2,12 @@
 
 #ifdef TESTING
 
-bool fail_calloc = false;
-bool fail_realloc = false;
 bool fail_xmlNewNode = false;
 bool fail_xmlNewDoc = false;
 bool fail_xmlNewProc = false;
 bool fail_xmlAddChild = false;
 bool fail_xmlXPathNewContext = false;
 
-#undef calloc
-void *MockCalloc(int count, size_t size) {
-  if (fail_calloc) {
-    return NULL;
-  } else {
-    return calloc(count, size);
-  }
-}
-
-#undef realloc
-void *MockRealloc(void *ptr, size_t size) {
-  if (fail_realloc) {
-    return NULL;
-  } else {
-    return realloc(ptr, size);
-  }
-}
-
 #undef xmlNewNode
 void *MockXmlNewNode(xmlNsPtr ns, const xmlChar *name) {
   if (fail_xmlNewNode) {

src/testing_tools.h

@@ -11,20 +11,12 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-extern bool fail_calloc;
-extern bool fail_realloc;
 extern bool fail_xmlNewNode;
 extern bool fail_xmlNewDoc;
 extern bool fail_xmlNewProc;
 extern bool fail_xmlAddChild;
 extern bool fail_xmlXPathNewContext;
 
-void *MockCalloc(int count, size_t size);
-#define calloc MockCalloc
-
-void *MockRealloc(void *ptr, size_t size);
-#define realloc MockRealloc
-
 void *MockXmlNewNode(xmlNsPtr ns, const xmlChar *name);
 #define xmlNewNode MockXmlNewNode