Merge pull request #7 from HTML-as-programming-language/Arduino

timostrating · web-flow · commit 1e33f7839b03 · 2018-09-29T18:24:41.000+02:00
added support for doctype and added includeFile to utils
diff --git a/HTML_to_C_compiler/elements/doctype.py b/HTML_to_C_compiler/elements/doctype.py
@@ -0,0 +1,15 @@
+from elements.element import Element
+from utils import includeFile
+
+
+class Doctype(Element):
+    """"
+    Een variabel om te bepalen wat voor platform de code voor bedoeld is (e.g: arduino) html is pc
+    HTML: <!DOCTYPE html>
+    """
+
+    def to_c(self):
+        if self.attributes.get("text", "") == "<!DOCTYPE arduino>":
+            return includeFile("libraries/arduinoLib.c") + "\n"
+        else:
+            return self.attributes.get("text", "") + "\n" #TODO niet dit
diff --git a/HTML_to_C_compiler/html_parser.py b/HTML_to_C_compiler/html_parser.py
@@ -34,6 +34,9 @@ def handle_closingtag(self, tagname, line):
         def finish_parsing(self):
             pass
 
+        def handle_doctype(self, doctype, line):
+            pass
+
     def feed(self, filepath, handler):
         """
         call this to start reading a HTML file
@@ -60,6 +63,11 @@ def feed(self, filepath, handler):
                 handler.handle_comment(tag[4:][:-3], start_line)
                 continue
 
+            if tagname == "!DOCTYPE":
+                #The great rule of life is to have no schemes but one unalterable purpose
+                handler.handle_doctype(tag, start_line)
+                continue
+
             data = tag.split(">")[1]
 
             is_self_closing_tag = tagname_and_attrs.endswith("/")   # <p/> is a self closing tag
diff --git a/HTML_to_C_compiler/lexer.py b/HTML_to_C_compiler/lexer.py
@@ -9,6 +9,7 @@
 from elements.var import Var
 from elements.loop import Loop
 from elements.link import Link, Script
+from elements.doctype import Doctype
 from html_parser import HTMLParser
 from utils import camel_case_to_hyphenated
 
@@ -47,7 +48,8 @@ def __init__(self, dir, filename):
             Return,
             Comment,    # <!-- this is a comment --> OR <comment text="this is a comment"/>
             Link,       # <link type="text/html" href="./include-this-file.html"/>
-            Script      # <script type="text/html" src="./include-this-file.html"/>
+            Script,      # <script type="text/html" src="./include-this-file.html"/>
+            Doctype
         ]
 
     def handle_starttag(self, tagname, attrs, line):
@@ -95,6 +97,10 @@ def handle_comment(self, comment_text, line):
         self.handle_starttag("comment", {"text": comment_text}, line)
         self.handle_closingtag("comment", line)
 
+    def handle_doctype(self, doctype, line):
+        self.handle_starttag("doctype", {"text": doctype}, line)
+        self.handle_closingtag("doctype", line)
+
     def new_element_by_tagname(self, tagname):
         """
         Creates an new element based on the tagname.
diff --git a/HTML_to_C_compiler/libraries/arduinoLib.c b/HTML_to_C_compiler/libraries/arduinoLib.c
@@ -0,0 +1,2 @@
+Deze tekst komt uit de arduino library,
+en moet later worden vervangen door C code
diff --git a/HTML_to_C_compiler/utils.py b/HTML_to_C_compiler/utils.py
@@ -43,3 +43,10 @@ def file_dir(filepath):
 
 def filename(filepath):
     return re.split("\/|\\\\", filepath[::-1], 1)[0][::-1]
+
+#returns the content of a file
+def includeFile(filepath):
+    file = open(filepath, "r")
+    content = file.read()
+    file.close()
+    return content
diff --git a/working-code.c b/working-code.c
@@ -1,21 +1,35 @@
+Deze tekst komt uit de arduino library,
+en moet later worden vervangen door C code
 // multi-line
 // comments
 // work 
 int a = 5;
 int b = 6;
-String eenString = "poep";
+String eenString = "multilinestring";
 char eenChar = 'b';
 bool timoIsAnAsshole = true;
 bool hilkoIsAnAsshole = false;
 int c = a;
+int b = &a;
 a = 100;
-logic()
-
-
-int multiplyPoep(int a, int b) {
-    return a*b;
-    
+expression()
+break()
+// OR? 
+pls-stop()
+continue()
+// OR? 
+next-pls()
+
+
+int multiply(int a) {
+// <param b default=6/> 
+return a*b;
+now-its-your-problem()
 }
+// 2 ways of including a file: 
+int includedVar = 4;
+// the following import will be ignored because 'working-code.html' imported this file: 
+// if it's not ignored an infinite loop of imports will occur 
 multiply(4, 5)
 
 
diff --git a/working-code.html b/working-code.html
@@ -1,4 +1,4 @@
-
+<!DOCTYPE arduino>
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Deze tekst komt uit de arduino library,`
	`2`	`+en moet later worden vervangen door C code`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+<!DOCTYPE arduino>`
`2`	`2`
`3`	`3`
`4`	`4`