Use pathlib in preprocessor.

Author: windelbouwman

examples/wasm/wasmboy.py

@@ -5,33 +5,37 @@
 $ copy the file dist/core/index.untouched.wasm
 """
 
-import sys
-import logging
-import os
 import argparse
+import logging
+import sys
+from pathlib import Path
 
 import numpy as np
 import pygame
 from pygame.locals import QUIT
 
-from ppci.wasm import Module, instantiate
 from ppci.utils import reporting
+from ppci.wasm import Module, instantiate
 
+this_dir = Path(__file__).resolve().parent
+default_gb_path = this_dir / "cpu_instrs.gb"
+wasmboy_path = this_dir / "wasmboy.wasm"
 parser = argparse.ArgumentParser()
-parser.add_argument("--rom", default="cpu_instrs.gb")
+parser.add_argument("--rom", default=default_gb_path, type=Path)
 args = parser.parse_args()
 logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger()
 
-with open("wasmboy.wasm", "rb") as f:
+logger.info(f"Loading {wasmboy_path}")
+with wasmboy_path.open("rb") as f:
     wasm_module = Module(f)
 
 
 def log(a: int, b: int, c: int, d: int, e: int, f: int, g: int) -> None:
     print("Log:", a, b, c, d, e, f, g)
 
 
-this_dir = os.path.dirname(os.path.abspath(__file__))
-html_report = os.path.join(this_dir, "wasmboy_report.html")
+html_report = this_dir / "wasmboy_report.html"
 with reporting.html_reporter(html_report) as reporter:
     wasm_boy = instantiate(
         wasm_module,
@@ -44,11 +48,10 @@ def log(a: int, b: int, c: int, d: int, e: int, f: int, g: int) -> None:
 # https://github.com/torch2424/wasmBoy/wiki/%5BWIP%5D-Core-API
 
 rom_filename = args.rom
-logging.info("Loading %s", rom_filename)
+logger.info("Loading %s", rom_filename)
 # Load in a game to CARTRIDGE_ROM_LOCATION
 rom_location = wasm_boy.exports.CARTRIDGE_ROM_LOCATION.read()
-with open(rom_filename, "rb") as f:
-    rom_data = f.read()
+rom_data = rom_filename.read_bytes()
 rom_size = len(rom_data)
 wasm_boy.exports.memory[rom_location : rom_location + rom_size] = rom_data
 

ppci/lang/c/__init__.py

@@ -1,18 +1,17 @@
 """C front end."""
 
-from .context import CContext
+from .api import c_to_ir, preprocess
 from .builder import CBuilder, create_ast, parse_text, parse_type
+from .context import CContext
 from .lexer import CLexer
+from .options import COptions
 from .parser import CParser
-from .semantics import CSemantics
-from .synthesize import CSynthesizer
 from .preprocessor import CPreProcessor
-from .utils import CAstPrinter, print_ast
 from .printer import CPrinter, render_ast
-from .options import COptions
+from .semantics import CSemantics
+from .synthesize import CSynthesizer
 from .token import CTokenPrinter
-from .api import preprocess, c_to_ir
-
+from .utils import CAstPrinter, print_ast
 
 __all__ = [
     "create_ast",

ppci/lang/c/api.py

@@ -1,9 +1,10 @@
 import io
+
+from ...utils.reporting import DummyReportGenerator
 from .builder import CBuilder
+from .options import COptions
 from .preprocessor import CPreProcessor
 from .token import CTokenPrinter
-from .options import COptions
-from ...utils.reporting import DummyReportGenerator
 
 
 def preprocess(f, output_file, coptions=None):

ppci/lang/c/builder.py

@@ -1,11 +1,12 @@
-import logging
 import io
-from .options import COptions
+import logging
+
+from .codegenerator import CCodeGenerator
 from .context import CContext
+from .options import COptions
 from .parser import CParser
-from .semantics import CSemantics
 from .preprocessor import CPreProcessor, prepare_for_parsing
-from .codegenerator import CCodeGenerator
+from .semantics import CSemantics
 from .utils import print_ast
 
 

ppci/lang/c/castxml.py

@@ -1,4 +1,5 @@
 import xml.etree.ElementTree as ET
+
 from .nodes import nodes
 
 

ppci/lang/c/codegenerator.py

@@ -8,15 +8,16 @@
 """
 
 import logging
+
 from ... import ir, irutils
-from ...common import CompilerError
 from ...binutils import debuginfo
-from .nodes import types, declarations, statements, expressions
-from .utils import required_padding
+from ...common import CompilerError
+from ...utils.bitfun import bits_to_bytes, value_to_bits
+from .eval import ConstantExpressionEvaluator
+from .nodes import declarations, expressions, statements, types
 from .nodes.types import BasicType
 from .scope import RootScope
-from ...utils.bitfun import value_to_bits, bits_to_bytes
-from .eval import ConstantExpressionEvaluator
+from .utils import required_padding
 
 
 class CCodeGenerator:

ppci/lang/c/context.py

@@ -2,13 +2,14 @@
 
 import logging
 import struct
-from ...common import CompilerError
-from ...arch.arch_info import Endianness
+
 from ... import ir
+from ...arch.arch_info import Endianness
+from ...common import CompilerError
+from .eval import ConstantExpressionEvaluator
+from .nodes import expressions, types
 from .nodes.types import BasicType
-from .nodes import types, expressions
 from .utils import required_padding
-from .eval import ConstantExpressionEvaluator
 
 
 class CContext:

ppci/lang/c/eval.py

@@ -1,4 +1,4 @@
-from .nodes import types, expressions, declarations
+from .nodes import declarations, expressions, types
 
 
 class ConstantExpressionEvaluator:

ppci/lang/c/init.py

@@ -5,6 +5,7 @@
 """
 
 import abc
+
 from .nodes import expressions, types
 
 

ppci/lang/c/lexer.py

@@ -1,10 +1,10 @@
 """C Language lexer"""
 
-import logging
 import io
+import logging
 
-from .token import CToken
 from ..tools.handlexer import HandLexerBase
+from .token import CToken
 
 
 class SourceFile: