Commit: 2e3a2844f5d3181ca304fcf7e5b5aea9cd6b5c98 - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• Revisión: 2e3a2844f5d3181ca304fcf7e5b5aea9cd6b5c98 (tree)
• Tiempo: 2023-01-29 02:29:07
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

asis

Cambiar Resumen

• modified: Makefile
• modified: castle/writers/CC2Cpy/Protocol.py

Diferencia incremental

diff -r 07af448d3018 -r 2e3a2844f5d3 Makefile
--- a/Makefile	Sat Jan 28 17:31:23 2023 +0100
+++ b/Makefile	Sat Jan 28 18:29:07 2023 +0100
@@ -6,13 +6,20 @@
 
 all: current demo test mutmut pyanalyse XXX missing
 
+ToCS_dir     = _ToCS-reports/
+COVERAGE_dir = ${ToCS_dir}Coverage/
+MUTMUT_dir   = ${ToCS_dir}MutMut/
+
 missing: missing_visitor missing_serialization
 
 PYTEST_OPTONS=-rxXsfE
 pytest test coverage:
 	coverage run --branch -m pytest ${PYTEST_OPTONS}  pytst/
 	coverage report  --skip-covered
-	coverage html
+	coverage html --directory=${COVERAGE_dir}
+coverage-open: coverage
+	open ${COVERAGE_dir}index.html
+
 pytest-only:								# No coverage reports
 	pytest ${PYTEST_OPTONS}  pytst
 pytest-s:								# -s : No capure (so, show stdout/stderr)
@@ -22,16 +29,16 @@
 
 mutmut: mutmut-3.11		    # Mutation testing (takes a long run) https://en.wikipedia.org/wiki/Mutation_testing
 	-mutmut run  --tests-dir pytst --paths-to-mutate castle
-	mutmut html && rm -rf mutmut-report ;mv html mutmut-report
+	mutmut html && rm ${MUTMUT_dir} ; mv html ${MUTMUT_dir}
 	mutmut results
+mutmut-open: mutmut
+	open ${MUTMUT_dir}index.html
 
 mutmut-3.11:
 	@echo Mutmut is currenly not working in python-3.11. See BUGS.rst. 
 	@echo But it works on 3.10 -- Therefore we use the 3.10 version
 	python --version
 
-mutmut-open: mutmut
-	open mutmut-report/index.html
 
 
 current:
@@ -67,21 +74,8 @@
 XXX:
 	grep XXX `find . -type f -name \*.py`
 
-clean: clean_caches
-clean_caches:
-	find . -type d -name __pycache__    -print0 | xargs -0  rm -r
-	find . -type d -name .pytest_cache  -print0 | xargs -0  rm -r
-	rm -f ./.coverage
-	rm -f ./.mutmut-cache
 
-cleaner: clean
-	rm -rf ./htmlcov/ #coverage
-	rm -rf mutmut-report/ # mutmut
-	rm -rf pyreversed/*
-
-cleanest veryclean: cleaner
-
-PYREVERSE_DIR=pyreversed
+PYREVERSE_DIR=pyreversed/
 PYREVERSE_FORMAT=svg
 PYREVERSE_OPTIONS=-k -A -my
 PYREVERSE_PRJS= castle castle.readers castle.ast castle.writers.CC2Cpy
@@ -91,6 +85,20 @@
 		echo "PYANALYSE::" $$P "...";\
 		pyreverse -d ${PYREVERSE_DIR} -o ${PYREVERSE_FORMAT} ${PYREVERSE_OPTIONS} -p $$P --colorized --max-color-depth=42 -my $$P >>/dev/null;\
 		echo ".. done. Result-files:" ;\
-		ls -l ${PYREVERSE_DIR}/*$${P}.${PYREVERSE_FORMAT} ;\
+		ls -l ${PYREVERSE_DIR}*$${P}.${PYREVERSE_FORMAT} ;\
 		echo;\
 	done
+
+clean: clean_caches
+clean_caches:
+	find . -type d -name __pycache__    -print0 | xargs -0  rm -r
+	find . -type d -name .pytest_cache  -print0 | xargs -0  rm -r
+	rm -f ./.coverage
+	rm -f ./.mutmut-cache
+
+cleaner: clean
+	rm -rf ${COVERAGE_dir}
+	rm -rf ${MUTMUT_dir}
+	rm -rf {PYREVERSE_DIR}*
+
+cleanest veryclean: cleaner

diff -r 07af448d3018 -r 2e3a2844f5d3 castle/writers/CC2Cpy/Protocol.py
--- a/castle/writers/CC2Cpy/Protocol.py	Sat Jan 28 17:31:23 2023 +0100
+++ b/castle/writers/CC2Cpy/Protocol.py	Sat Jan 28 18:29:07 2023 +0100
@@ -87,7 +87,7 @@
 
         for n, e in enumerate(self.events, len(self.event_dict(inherired=True, mine=False))):       # pragma: no mutate on event_dict parms
             lineval = []
-            lineval.append(f'{prepend}{indent*2}{{')                                                # pragma: no mutate
+            lineval.append(f'{prepend}{indent*2}{{')                                                # XXXpragma: no mutate
             lineval.append(f'  .seqNo   = {n}, ')
             lineval.append(f'  .name    = "{e.name}", ')
             lineval.append(f'  .part_of = &{var_name} ')
@@ -95,24 +95,25 @@
             # add line to retval
             retval.append("".join(lineval))
 
-        retval.append(f'{prepend}{indent*2}}}')   #end of events
-        retval.append(f'{prepend}}};\n')          # end of struct
+        retval.append(f'{prepend}{indent*2}}}')   #end of events      XXX Mutant 41
+        retval.append(f'{prepend}}};\n')          #end of struct
         return '\n'.join(retval) +"\n"
 
+    # XXX Mutant 45,46: default values prepend/indent
     def render_indexes(self, prepend:str="", indent="  ") ->str:                                    ## #define CC_P_<proto>_<event> index
         ## For now, loop over the events here ...
         retval = []
-        for n, e in enumerate(self.events, len(self.event_dict(inherired=True,mine=False))):
+        for n, e in enumerate(self.events, len(self.event_dict(inherired=True,mine=False))): # pragma: no mutate on event_dict parms
             retval.append(f'#define CC_P_{self.name}_{e.name}\t{n}\n')
         return '\n'.join(retval)+"\n"
 
-
+    # XXX Mutant 53/53: default values prepend/indent
     def render_FTs(self, prepend:str="", indent="  ") ->str: ##typedef void (*CC_E_{...}_FT)(CC_selfType, CC_ComponentType, {...});
         type_name = lambda ptype : ptype if isinstance(ptype, str) else ptype.__name__
 
         retval = []
         for  e in self.events:
-            types =" , ".join(f'{type_name(parm.type)}' for parm in e.typedParameters)
+            types =" , ".join(f'{type_name(parm.type)}' for parm in e.typedParameters)   # pragma: no mutate on " , " befor join()
             retval.append( f'typedef void (*CC_E_{self.name}_{e.name}_FT)(CC_selfType, CC_ComponentType, {types});')
         return '\n'.join(retval)+"\n"