From 4c2a29ae01bf539e8cb60e3afaaa2dab94866891 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Sun, 27 Jan 2019 18:20:59 +0000
Subject: [PATCH] Convert to ruamel.yaml and allow \x7f characters, since llvm
 sometimes outputs them.

---
 development/llvm2json.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/development/llvm2json.py b/development/llvm2json.py
index d7c432c6b..3a51b7dd2 100644
--- a/development/llvm2json.py
+++ b/development/llvm2json.py
@@ -2,10 +2,11 @@ import argparse
 import binascii
 import datetime
 import json
+import re
 import subprocess
 from typing import Dict
 
-import yaml
+from ruamel import yaml
 
 value_map = {
     'LF_STRUCTURE': 'Class',
@@ -295,10 +296,12 @@ if __name__ == '__main__':
         file_data = process.stdout
     else:
         print("[*] Openning {}".format(args.file))
-        file_data = open(args.file, 'r').read()
+        file_data = open(args.file, 'r')
 
     print("[*] Loading YAML data...")
-    data = yaml.load(file_data)
+    ryaml = yaml.YAML()
+    yaml.reader.Reader.NON_PRINTABLE = re.compile(u'[^\x09\x0A\x0D\x20-\x7F\x85' u'\xA0-\uD7FF' u'\uE000-\uFFFD' u']')
+    data = ryaml.load(file_data)
 
     print("[*] Converting the YAML to JSON...")
     sc.set_yaml_data(data)