first use of libexpat

Author: depaolim

.gitignore

@@ -7,6 +7,7 @@ cscope.out
 libmicropython.a
 lua-5.3.5
 lua-5.3.5.tar.gz
+elements
 shell_lua
 shell_py
 shell_upy

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "cpython"]
 	path = cpython
 	url = https://github.com/python/cpython.git
+[submodule "libexpat"]
+	path = libexpat
+	url = https://github.com/libexpat/libexpat.git

Makefile

@@ -1,6 +1,7 @@
 MPTOP = micropython
 LUATOP = lua-5.3.5
 PYTOP = cpython
+EXPATTOP = libexpat
 
 all: test
 
@@ -48,7 +49,20 @@ shell_lua: lua shell.o emb_lua.o
 emb_lua.o: lua emb_lua.cpp
 	g++ -std=c++11 -c emb_lua.cpp -I$(LUATOP)/src
 
-test: shell_py shell_upy shell_lua
+elements: expat
+	gcc -std=c99 -c elements.c -I$(EXPATTOP)/expat/lib
+	g++ -o elements elements.o -lexpat -L$(EXPATTOP)/expat/lib
+	# ./elements < $(EXPATTOP)/testdata/largefiles/nes96.xml
+
+expat: $(EXPATTOP)/expat $(EXPATTOP)/expat/lib/libexpat.la
+
+$(EXPATTOP)/expat:
+	git submodule update --init --recursive
+
+$(EXPATTOP)/expat/lib/libexpat.la:
+	(cd $(EXPATTOP)/expat; mkdir -p m4; ./buildconf.sh; ./configure --without-docbook; make)
+
+test: shell_py shell_upy shell_lua elements
 	(export PYTHONHOME=$(PYTOP) ; export PYTHONPATH=$(PYTOP)/Lib:$(PYTOP)/build/lib.linux-x86_64-3.8 ; $(PYTOP)/python tests.py)
 
 test_threads:
@@ -60,13 +74,15 @@ cscope:
 	cscope -R
 
 clean:
-	rm -rf shell_upy shell_lua shell_py
+	rm -rf shell_upy shell_lua shell_py elements
 	rm -rf *.o libmicropython.a build
 	rm -rf __pycache__
 	rm -rf cscope.out
 	rm -rf $(LUATOP)
+	rm -rf $(EXPATTOP)/expat/lib/libexpat.la
 
 clean_all: clean
 	rm -rf $(LUATOP).tar.gz
 	git submodule deinit $(MPTOP)
 	git submodule deinit $(PYTOP)
+	git submodule deinit $(EXPATTOP)

README.md

@@ -7,7 +7,7 @@ Some python tests to verify the stuff
 Prerequisites for Ubuntu:
 
 ```
-  sudo apt install build-essential unzip
+  sudo apt install build-essential unzip libtool
 ```
 
 To download, build everything and run the tests:

elements.c

@@ -0,0 +1,50 @@
+#include <stdio.h>
+#include <expat.h>
+
+static void XMLCALL
+startElement(void *userData, const XML_Char *name, const XML_Char **atts)
+{
+  int i;
+  int *depthPtr = (int *)userData;
+  (void)atts;
+
+  for (i = 0; i < *depthPtr; i++)
+    putchar('\t');
+  printf("%s\n", name);
+  *depthPtr += 1;
+}
+
+static void XMLCALL
+endElement(void *userData, const XML_Char *name)
+{
+  int *depthPtr = (int *)userData;
+  (void)name;
+
+  *depthPtr -= 1;
+}
+
+int
+main(int argc, char *argv[])
+{
+  char buf[BUFSIZ];
+  XML_Parser parser = XML_ParserCreate(NULL);
+  int done;
+  int depth = 0;
+  (void)argc;
+  (void)argv;
+
+  XML_SetUserData(parser, &depth);
+  XML_SetElementHandler(parser, startElement, endElement);
+  do {
+    size_t len = fread(buf, 1, sizeof(buf), stdin);
+    done = len < sizeof(buf);
+    if (XML_Parse(parser, buf, (int)len, done) == XML_STATUS_ERROR) {
+      fprintf(stderr, "%s at line %lu\n",
+              XML_ErrorString(XML_GetErrorCode(parser)),
+              XML_GetCurrentLineNumber(parser));
+      return 1;
+    }
+  } while (!done);
+  XML_ParserFree(parser);
+  return 0;
+}

libexpat

@@ -2,16 +2,38 @@
 import unittest
 
 
-class Shell:
-    def __init__(self, lang):
-        prog = "./shell_" + lang
+class Prog:
+    def __init__(self, *cmd):
         self.shell = subprocess.Popen(
-                prog, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     def __getattr__(self, item):
         return getattr(self.shell, item)
 
 
+class Shell(Prog):
+    def __init__(self, lang):
+        super().__init__("./shell_" + lang)
+
+
+class TestElements(unittest.TestCase):
+    def test_ok(self):
+        prog = Prog("./elements")
+        prog.stdin.write(b"<xml><tag></tag></xml>")
+        stdoutdata, stderrdata = prog.communicate()
+        self.assertEqual(prog.returncode, 0)
+        self.assertIn(b"tag", stdoutdata)
+        self.assertFalse(stderrdata)
+
+    def test_nok(self):
+        prog = Prog("./elements")
+        prog.stdin.write(b"<xml></xml-wrong>")
+        stdoutdata, stderrdata = prog.communicate()
+        self.assertNotEqual(prog.returncode, 0)
+        self.assertIn(b"xml", stdoutdata)
+        self.assertIn(b"mismatched tag at line 1", stderrdata)
+
+
 class TestPy(unittest.TestCase):
     def test_print(self):
         shell = Shell("py")