From 1ad27606e2b8c24b521f5f0e1737932a84a170f7 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Sat, 9 Feb 2019 13:49:51 +0100 Subject: Remove core/utils It has long been replaced by common/utils. Signed-off-by: Michael Buesch --- awlsim/awlcompiler/insntrans.py | 3 ++- awlsim/awlcompiler/optrans.py | 3 ++- awlsim/awlcompiler/tokenizer.py | 7 +++--- awlsim/awlcompiler/translator.py | 3 ++- awlsim/core/__init__.py | 1 - awlsim/core/blocks.py | 2 +- awlsim/core/callstack.py | 2 +- awlsim/core/counters.py | 3 +-- awlsim/core/cpu.py | 1 - awlsim/core/datablocks.py | 2 +- awlsim/core/datastructure.py | 2 +- awlsim/core/datatypes.py | 2 +- awlsim/core/hardware.py | 1 + awlsim/core/identifier.py | 3 +-- awlsim/core/instructions/main.py | 2 +- awlsim/core/instructions/parentinfo.py | 1 + awlsim/core/instructions/types.py | 1 + awlsim/core/labels.py | 2 +- awlsim/core/main.py | 2 +- awlsim/core/obtemp.py | 2 +- awlsim/core/offset.py | 3 +-- awlsim/core/operators.py | 2 +- awlsim/core/parameters.py | 2 +- awlsim/core/parenstack.py | 1 + awlsim/core/statusword.py | 3 +-- awlsim/core/symbolparser.py | 2 +- awlsim/core/systemblocks/error_codes.py | 1 + awlsim/core/systemblocks/system_sfb_0.py | 2 +- awlsim/core/systemblocks/system_sfb_1.py | 2 +- awlsim/core/systemblocks/system_sfb_2.py | 2 +- awlsim/core/systemblocks/system_sfb_3.py | 2 +- awlsim/core/systemblocks/system_sfb_4.py | 2 +- awlsim/core/systemblocks/system_sfb_5.py | 2 +- awlsim/core/systemblocks/system_sfb_m1.py | 2 +- awlsim/core/systemblocks/system_sfc_21.py | 2 +- awlsim/core/systemblocks/system_sfc_46.py | 2 +- awlsim/core/systemblocks/system_sfc_47.py | 2 +- awlsim/core/systemblocks/system_sfc_64.py | 2 +- awlsim/core/systemblocks/system_sfc_m1.py | 2 +- awlsim/core/systemblocks/system_sfc_m2.py | 2 +- awlsim/core/systemblocks/system_sfc_m3.py | 2 +- awlsim/core/systemblocks/system_sfc_m4.py | 2 +- awlsim/core/systemblocks/systemblockinterface.py | 1 + awlsim/core/systemblocks/systemblocks.py | 1 + awlsim/core/timers.py | 2 +- awlsim/core/userdefinedtypes.py | 2 +- awlsim/core/util.py | 27 ------------------------ 47 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 awlsim/core/util.py diff --git a/awlsim/awlcompiler/insntrans.py b/awlsim/awlcompiler/insntrans.py index 5603c2a1..80c4e577 100644 --- a/awlsim/awlcompiler/insntrans.py +++ b/awlsim/awlcompiler/insntrans.py @@ -24,8 +24,9 @@ from awlsim.common.compat import * from awlsim.common.cpuspecs import * #+cimport from awlsim.common.cpuconfig import * +from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.instructions.all_insns import * #+cimport from awlsim.core.instructions.types import * #+cimport diff --git a/awlsim/awlcompiler/optrans.py b/awlsim/awlcompiler/optrans.py index 20c6678b..9ce69e7d 100644 --- a/awlsim/awlcompiler/optrans.py +++ b/awlsim/awlcompiler/optrans.py @@ -32,9 +32,10 @@ import re from awlsim.common.cpuspecs import * #+cimport from awlsim.common.cpuconfig import * from awlsim.common.datatypehelpers import * #+cimport +from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.operators import * #+cimport -from awlsim.core.util import * from awlsim.core.parameters import * #+cimport from awlsim.core.memory import * #+cimport from awlsim.core.offset import * #+cimport diff --git a/awlsim/awlcompiler/tokenizer.py b/awlsim/awlcompiler/tokenizer.py index 31d0d7b5..d17cf045 100644 --- a/awlsim/awlcompiler/tokenizer.py +++ b/awlsim/awlcompiler/tokenizer.py @@ -23,7 +23,6 @@ from __future__ import division, absolute_import, print_function, unicode_litera #from awlsim.common.cython_support cimport * #@cy from awlsim.common.compat import * -import sys import re from awlsim.common.enumeration import * @@ -31,11 +30,11 @@ from awlsim.common.project import * from awlsim.common.refmanager import * from awlsim.common.namevalidation import * from awlsim.common.sources import AwlSource +from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.datatypes import * -from awlsim.core.memory import * #@nocy -#from awlsim.core.memory cimport * #@cy +from awlsim.core.memory import * #+cimport from awlsim.core.identifier import * diff --git a/awlsim/awlcompiler/translator.py b/awlsim/awlcompiler/translator.py index f0053550..4fe9fc0b 100644 --- a/awlsim/awlcompiler/translator.py +++ b/awlsim/awlcompiler/translator.py @@ -25,10 +25,11 @@ from awlsim.common.compat import * from awlsim.common.cpuconfig import * from awlsim.common.datatypehelpers import * #+cimport +from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.instructions.all_insns import * #+cimport from awlsim.core.datastructure import * #+cimport -from awlsim.core.util import * from awlsim.core.offset import * #+cimport from awlsim.core.operatortypes import * #+cimport from awlsim.core.operators import * #+cimport diff --git a/awlsim/core/__init__.py b/awlsim/core/__init__.py index d0199d6c..23ff9304 100644 --- a/awlsim/core/__init__.py +++ b/awlsim/core/__init__.py @@ -4,4 +4,3 @@ from awlsim.common.compat import * from awlsim.core.main import * from awlsim.core.cpu import * from awlsim.core.hardware import * -from awlsim.core.util import * diff --git a/awlsim/core/blocks.py b/awlsim/core/blocks.py index b3786f93..6aa5ce75 100644 --- a/awlsim/core/blocks.py +++ b/awlsim/core/blocks.py @@ -27,6 +27,7 @@ from awlsim.common.refmanager import * from awlsim.common.blockinfo import * from awlsim.common.wordpacker import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.blockinterface import * from awlsim.core.labels import * #+cimport @@ -34,7 +35,6 @@ from awlsim.core.datatypes import * from awlsim.core.memory import * #+cimport from awlsim.core.operatortypes import * #+cimport from awlsim.core.operators import * #+cimport -from awlsim.core.util import * from awlsim.core.offset import * #+cimport from awlsim.core.lstack import * #+cimport diff --git a/awlsim/core/callstack.py b/awlsim/core/callstack.py index 6bfadd5e..52934c7f 100644 --- a/awlsim/core/callstack.py +++ b/awlsim/core/callstack.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.datatypes import * from awlsim.core.memory import * #+cimport @@ -35,7 +36,6 @@ from awlsim.core.blockinterface import * from awlsim.core.datablocks import * #+cimport from awlsim.core.parameters import * #+cimport from awlsim.core.parenstack import * #+cimport -from awlsim.core.util import * __all__ = [ diff --git a/awlsim/core/counters.py b/awlsim/core/counters.py index 6212242c..eb35ea58 100644 --- a/awlsim/core/counters.py +++ b/awlsim/core/counters.py @@ -24,8 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * - -from awlsim.core.util import * +from awlsim.common.util import * class Counter(object): #+cdef diff --git a/awlsim/core/cpu.py b/awlsim/core/cpu.py index 31cbbc56..c4a8a633 100644 --- a/awlsim/core/cpu.py +++ b/awlsim/core/cpu.py @@ -61,7 +61,6 @@ from awlsim.core.callstack import * #+cimport from awlsim.core.lstack import * #+cimport from awlsim.core.offset import * #+cimport from awlsim.core.obtemp import * #+cimport -from awlsim.core.util import * from awlsim.core.insnmeas import * #+cimport from awlsim.awlcompiler.tokenizer import * diff --git a/awlsim/core/datablocks.py b/awlsim/core/datablocks.py index d4d59c99..200c2d44 100644 --- a/awlsim/core/datablocks.py +++ b/awlsim/core/datablocks.py @@ -26,8 +26,8 @@ from awlsim.common.compat import * from awlsim.common.blockinfo import * from awlsim.common.enumeration import * from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.operators import * #+cimport from awlsim.core.datatypes import * from awlsim.core.memory import * #+cimport diff --git a/awlsim/core/datastructure.py b/awlsim/core/datastructure.py index cf0cf616..c5214e2f 100644 --- a/awlsim/core/datastructure.py +++ b/awlsim/core/datastructure.py @@ -25,8 +25,8 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.identifier import * from awlsim.core.memory import * #+cimport from awlsim.core.offset import * #+cimport diff --git a/awlsim/core/datatypes.py b/awlsim/core/datatypes.py index 3b698596..06b18ce5 100644 --- a/awlsim/core/datatypes.py +++ b/awlsim/core/datatypes.py @@ -27,8 +27,8 @@ from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.immutable import * from awlsim.common.enumeration import * from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.timers import * #+cimport from awlsim.core.offset import * #+cimport from awlsim.core.identifier import * diff --git a/awlsim/core/hardware.py b/awlsim/core/hardware.py index b84dee5a..4618beb2 100644 --- a/awlsim/core/hardware.py +++ b/awlsim/core/hardware.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.offset import * #+cimport from awlsim.core.hardware_loader import * diff --git a/awlsim/core/identifier.py b/awlsim/core/identifier.py index e3977cb8..c9a3add5 100644 --- a/awlsim/core/identifier.py +++ b/awlsim/core/identifier.py @@ -24,8 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * - -from awlsim.core.util import * +from awlsim.common.util import * __all__ = [ diff --git a/awlsim/core/instructions/main.py b/awlsim/core/instructions/main.py index adf03658..266daa94 100644 --- a/awlsim/core/instructions/main.py +++ b/awlsim/core/instructions/main.py @@ -26,12 +26,12 @@ from awlsim.common.compat import * from awlsim.common.cpuconfig import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.instructions.types import * #+cimport from awlsim.core.instructions.parentinfo import * from awlsim.core.operatortypes import * #+cimport from awlsim.core.operators import * #+cimport -from awlsim.core.util import * from awlsim.awlcompiler.optrans import * diff --git a/awlsim/core/instructions/parentinfo.py b/awlsim/core/instructions/parentinfo.py index c6a8356f..0660157c 100644 --- a/awlsim/core/instructions/parentinfo.py +++ b/awlsim/core/instructions/parentinfo.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.util import * +from awlsim.common.exceptions import * from awlsim.common.enumeration import * diff --git a/awlsim/core/instructions/types.py b/awlsim/core/instructions/types.py index 792a1989..5bf24c10 100644 --- a/awlsim/core/instructions/types.py +++ b/awlsim/core/instructions/types.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.enumeration import * +from awlsim.common.exceptions import * from awlsim.common.util import * diff --git a/awlsim/core/labels.py b/awlsim/core/labels.py index 56f1111e..6beb3ce3 100644 --- a/awlsim/core/labels.py +++ b/awlsim/core/labels.py @@ -25,10 +25,10 @@ from awlsim.common.compat import * from awlsim.common.sources import AwlSource from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.operatortypes import * #+cimport from awlsim.core.operators import * #+cimport -from awlsim.core.util import * class AwlLabel(object): #+cdef diff --git a/awlsim/core/main.py b/awlsim/core/main.py index 8a155f54..1410f493 100644 --- a/awlsim/core/main.py +++ b/awlsim/core/main.py @@ -27,8 +27,8 @@ from awlsim.common.project import * from awlsim.common.env import * from awlsim.common.exceptions import * from awlsim.common.profiler import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.cpu import * #+cimport from awlsim.core.hardware import * #+cimport from awlsim.core.hardware_loader import * diff --git a/awlsim/core/obtemp.py b/awlsim/core/obtemp.py index 55fd4856..95e434ea 100644 --- a/awlsim/core/obtemp.py +++ b/awlsim/core/obtemp.py @@ -24,8 +24,8 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.cpu import * #+cimport import math diff --git a/awlsim/core/offset.py b/awlsim/core/offset.py index e4a5ef4f..8cbcc85f 100644 --- a/awlsim/core/offset.py +++ b/awlsim/core/offset.py @@ -25,8 +25,7 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * - -from awlsim.core.util import * +from awlsim.common.util import * #cimport cython #@cy diff --git a/awlsim/core/operators.py b/awlsim/core/operators.py index 7b796db3..1f240fa8 100644 --- a/awlsim/core/operators.py +++ b/awlsim/core/operators.py @@ -25,13 +25,13 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.operatortypes import * #+cimport from awlsim.core.memory import * #+cimport from awlsim.core.offset import * #+cimport from awlsim.core.statusword import * #+cimport from awlsim.core.timers import * #+cimport -from awlsim.core.util import * class AwlOperator(object): #+cdef diff --git a/awlsim/core/parameters.py b/awlsim/core/parameters.py index 37f6242f..aa672f39 100644 --- a/awlsim/core/parameters.py +++ b/awlsim/core/parameters.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.datastructure import * #+cimport from awlsim.core.operatortypes import * #+cimport @@ -31,7 +32,6 @@ from awlsim.core.operators import * #+cimport from awlsim.core.datablocks import * #+cimport from awlsim.core.blocks import * #+cimport from awlsim.core.blockinterface import * -from awlsim.core.util import * __all__ = [ diff --git a/awlsim/core/parenstack.py b/awlsim/core/parenstack.py index 4b0e27ce..f5f48ff1 100644 --- a/awlsim/core/parenstack.py +++ b/awlsim/core/parenstack.py @@ -26,6 +26,7 @@ from awlsim.common.compat import * from awlsim.common.cpuspecs import * #+cimport from awlsim.common.cpuconfig import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.cpu import * #+cimport from awlsim.core.statusword import * #+cimport diff --git a/awlsim/core/statusword.py b/awlsim/core/statusword.py index 89e358eb..cfc0dc6c 100644 --- a/awlsim/core/statusword.py +++ b/awlsim/core/statusword.py @@ -29,8 +29,7 @@ from awlsim.common.cpuspecs import * #+cimport from awlsim.common.cpuconfig import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * - -from awlsim.core.util import * +from awlsim.common.util import * class S7StatusWord(object): #+cdef diff --git a/awlsim/core/symbolparser.py b/awlsim/core/symbolparser.py index 35962077..e460afa3 100644 --- a/awlsim/core/symbolparser.py +++ b/awlsim/core/symbolparser.py @@ -26,9 +26,9 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * from awlsim.common.cpuconfig import * +from awlsim.common.util import * from awlsim.core.memory import * #+cimport -from awlsim.core.util import * from awlsim.awlcompiler.optrans import * diff --git a/awlsim/core/systemblocks/error_codes.py b/awlsim/core/systemblocks/error_codes.py index fb69f5f0..6d8f13de 100644 --- a/awlsim/core/systemblocks/error_codes.py +++ b/awlsim/core/systemblocks/error_codes.py @@ -23,6 +23,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera #from awlsim.common.cython_support cimport * #@cy from awlsim.common.compat import * +from awlsim.common.util import * from awlsim.common.exceptions import * diff --git a/awlsim/core/systemblocks/system_sfb_0.py b/awlsim/core/systemblocks/system_sfb_0.py index e5021ee8..c4fb33d5 100644 --- a/awlsim/core/systemblocks/system_sfb_0.py +++ b/awlsim/core/systemblocks/system_sfb_0.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB0(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_1.py b/awlsim/core/systemblocks/system_sfb_1.py index 58e606dc..096fd63a 100644 --- a/awlsim/core/systemblocks/system_sfb_1.py +++ b/awlsim/core/systemblocks/system_sfb_1.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB1(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_2.py b/awlsim/core/systemblocks/system_sfb_2.py index e88a6021..b37b2e8a 100644 --- a/awlsim/core/systemblocks/system_sfb_2.py +++ b/awlsim/core/systemblocks/system_sfb_2.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB2(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_3.py b/awlsim/core/systemblocks/system_sfb_3.py index 9544f3f7..2c458b1e 100644 --- a/awlsim/core/systemblocks/system_sfb_3.py +++ b/awlsim/core/systemblocks/system_sfb_3.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB3(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_4.py b/awlsim/core/systemblocks/system_sfb_4.py index dae13e54..26a426a6 100644 --- a/awlsim/core/systemblocks/system_sfb_4.py +++ b/awlsim/core/systemblocks/system_sfb_4.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB4(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_5.py b/awlsim/core/systemblocks/system_sfb_5.py index f55c4643..cff40d81 100644 --- a/awlsim/core/systemblocks/system_sfb_5.py +++ b/awlsim/core/systemblocks/system_sfb_5.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFB5(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfb_m1.py b/awlsim/core/systemblocks/system_sfb_m1.py index b3be20c1..fc501ae8 100644 --- a/awlsim/core/systemblocks/system_sfb_m1.py +++ b/awlsim/core/systemblocks/system_sfb_m1.py @@ -24,11 +24,11 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFBm1(SFB): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_21.py b/awlsim/core/systemblocks/system_sfc_21.py index c139cf71..79ecc269 100644 --- a/awlsim/core/systemblocks/system_sfc_21.py +++ b/awlsim/core/systemblocks/system_sfc_21.py @@ -26,6 +26,7 @@ from awlsim.common.compat import * from awlsim.common.wordpacker import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.systemblocks.error_codes import * @@ -35,7 +36,6 @@ from awlsim.core.operatortypes import * #+cimport from awlsim.core.operators import * #+cimport from awlsim.core.memory import * #+cimport from awlsim.core.blockinterface import * -from awlsim.core.util import * class SFC21(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_46.py b/awlsim/core/systemblocks/system_sfc_46.py index 417d3d81..13eef500 100644 --- a/awlsim/core/systemblocks/system_sfc_46.py +++ b/awlsim/core/systemblocks/system_sfc_46.py @@ -24,11 +24,11 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFC46(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_47.py b/awlsim/core/systemblocks/system_sfc_47.py index dd961f5a..00fa1427 100644 --- a/awlsim/core/systemblocks/system_sfc_47.py +++ b/awlsim/core/systemblocks/system_sfc_47.py @@ -26,11 +26,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * from awlsim.common.monotonic import * #+cimport +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * import time diff --git a/awlsim/core/systemblocks/system_sfc_64.py b/awlsim/core/systemblocks/system_sfc_64.py index bf4e5c30..37820a1a 100644 --- a/awlsim/core/systemblocks/system_sfc_64.py +++ b/awlsim/core/systemblocks/system_sfc_64.py @@ -24,11 +24,11 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFC64(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_m1.py b/awlsim/core/systemblocks/system_sfc_m1.py index f6430f4a..0fa49a0f 100644 --- a/awlsim/core/systemblocks/system_sfc_m1.py +++ b/awlsim/core/systemblocks/system_sfc_m1.py @@ -24,11 +24,11 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFCm1(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_m2.py b/awlsim/core/systemblocks/system_sfc_m2.py index 22c90d35..edade731 100644 --- a/awlsim/core/systemblocks/system_sfc_m2.py +++ b/awlsim/core/systemblocks/system_sfc_m2.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFCm2(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_m3.py b/awlsim/core/systemblocks/system_sfc_m3.py index 6fa4625e..31c438fe 100644 --- a/awlsim/core/systemblocks/system_sfc_m3.py +++ b/awlsim/core/systemblocks/system_sfc_m3.py @@ -25,11 +25,11 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFCm3(SFC): #+cdef diff --git a/awlsim/core/systemblocks/system_sfc_m4.py b/awlsim/core/systemblocks/system_sfc_m4.py index ba9b3c20..b1887cd4 100644 --- a/awlsim/core/systemblocks/system_sfc_m4.py +++ b/awlsim/core/systemblocks/system_sfc_m4.py @@ -24,11 +24,11 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.systemblocks.systemblocks import * #+cimport from awlsim.core.blockinterface import * from awlsim.core.datatypes import * -from awlsim.core.util import * class SFCm4(SFC): #+cdef diff --git a/awlsim/core/systemblocks/systemblockinterface.py b/awlsim/core/systemblocks/systemblockinterface.py index 83112fef..8b4eba1f 100644 --- a/awlsim/core/systemblocks/systemblockinterface.py +++ b/awlsim/core/systemblocks/systemblockinterface.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.blockinterface import * diff --git a/awlsim/core/systemblocks/systemblocks.py b/awlsim/core/systemblocks/systemblocks.py index 91066be6..33ecc2c9 100644 --- a/awlsim/core/systemblocks/systemblocks.py +++ b/awlsim/core/systemblocks/systemblocks.py @@ -24,6 +24,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera from awlsim.common.compat import * from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.instructions.insn_generic_call import * #+cimport from awlsim.core.systemblocks.error_codes import * diff --git a/awlsim/core/timers.py b/awlsim/core/timers.py index dd5ce9aa..96018d5f 100644 --- a/awlsim/core/timers.py +++ b/awlsim/core/timers.py @@ -25,9 +25,9 @@ from awlsim.common.compat import * from awlsim.common.datatypehelpers import * #+cimport from awlsim.common.exceptions import * +from awlsim.common.util import * from awlsim.core.statusword import * #+cimport -from awlsim.core.util import * # Get the C round() function. This is different from the Python3 round(). #from libc.math cimport round #@cy diff --git a/awlsim/core/userdefinedtypes.py b/awlsim/core/userdefinedtypes.py index dd91bcc4..750064a0 100644 --- a/awlsim/core/userdefinedtypes.py +++ b/awlsim/core/userdefinedtypes.py @@ -26,8 +26,8 @@ from awlsim.common.compat import * from awlsim.common.blockinfo import * from awlsim.common.enumeration import * from awlsim.common.exceptions import * +from awlsim.common.util import * -from awlsim.core.util import * from awlsim.core.blocks import * #+cimport from awlsim.core.datastructure import * #+cimport diff --git a/awlsim/core/util.py b/awlsim/core/util.py deleted file mode 100644 index 7cfc8335..00000000 --- a/awlsim/core/util.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# -# AWL simulator - utility functions -# -# Copyright 2012-2015 Michael Buesch -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# - -from __future__ import division, absolute_import, print_function, unicode_literals -#from awlsim.common.cython_support cimport * #@cy -from awlsim.common.compat import * - -from awlsim.common.util import * -from awlsim.common.exceptions import * -- cgit v1.2.3