Merge remote-tracking branch 'kanzure/use-new-preprocessor'

2 files changed, 4 insertions, 3 deletions

diff --git a/extras b/extras
-Subproject 7aa016fb528bcc8dcb30c6a887957851623eccc
+Subproject 2374a9ce905ccc4c701f81904b01019641e884b
diff --git a/textpre.py b/textpre.py
index 4a5fb116..c4e65398 100644
--- a/textpre.py
+++ b/textpre.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import extras.pokemontools.preprocessor as preprocessor
+import extras.pokemontools.configuration as configuration
 
 import sys
 
@@ -261,6 +262,6 @@ chars = {
 
 preprocessor.chars = chars
 
-macros = []
-macro_table = preprocessor.make_macro_table(macros)
-preprocessor.preprocess(macro_table)
+config = configuration.Config()
+processor = preprocessor.Preprocessor(config, [])
+processor.preprocess()