gh-113299: Move cpp.py into libclinic (#113526)

This commit is contained in:
Erlend E. Aasland 2023-12-28 00:20:57 +01:00 committed by GitHub
parent 87295b4068
commit 7ab9efdd6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View file

@ -3920,7 +3920,7 @@ class ClinicReprTests(unittest.TestCase):
self.assertEqual(repr(parameter), "<clinic.Parameter 'bar'>") self.assertEqual(repr(parameter), "<clinic.Parameter 'bar'>")
def test_Monitor_repr(self): def test_Monitor_repr(self):
monitor = clinic.cpp.Monitor("test.c") monitor = libclinic.cpp.Monitor("test.c")
self.assertRegex(repr(monitor), r"<clinic.Monitor \d+ line=0 condition=''>") self.assertRegex(repr(monitor), r"<clinic.Monitor \d+ line=0 condition=''>")
monitor.line_number = 42 monitor.line_number = 42

View file

@ -13,7 +13,6 @@ import builtins as bltns
import collections import collections
import contextlib import contextlib
import copy import copy
import cpp
import dataclasses as dc import dataclasses as dc
import enum import enum
import functools import functools
@ -53,6 +52,7 @@ from typing import (
# Local imports. # Local imports.
import libclinic import libclinic
import libclinic.cpp
from libclinic import ClinicError from libclinic import ClinicError
@ -648,7 +648,7 @@ class CLanguage(Language):
def __init__(self, filename: str) -> None: def __init__(self, filename: str) -> None:
super().__init__(filename) super().__init__(filename)
self.cpp = cpp.Monitor(filename) self.cpp = libclinic.cpp.Monitor(filename)
def parse_line(self, line: str) -> None: def parse_line(self, line: str) -> None:
self.cpp.writeline(line) self.cpp.writeline(line)

View file

@ -3,7 +3,10 @@ import re
import sys import sys
from typing import NoReturn from typing import NoReturn
from libclinic.errors import ParseError from .errors import ParseError
__all__ = ["Monitor"]
TokenAndCondition = tuple[str, str] TokenAndCondition = tuple[str, str]