This is super cool, thank you!
Am 03.10.2019 20:19 schrieb Davide Andreoli <[email protected]>:
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b12f07e52bf5d16
595cc3ef120ecdc8c203437fc
commit b12f07e52bf5d16595cc3ef120ecdc8c203437fc
Author: Dave Andreoli <[email protected]>
Date: Thu Oct 3 20:18:54 2019 +0200
Pyolian gendoc: unbreak after recent eolian changes
shiny new generated documentation can be seen at:
www.gurumeditation.it/dokuwiki_efl/
---
src/scripts/gendoc/doc_enum.template | 2 +-
src/scripts/gendoc/doc_macros.include | 4 ++--
src/scripts/gendoc/gendoc.py | 20
+++++++++++---------
src/scripts/pyolian/eolian.py | 2 +-
src/scripts/pyolian/generator.py | 2 +-
src/scripts/pyolian/test_gen_class.template | 3 +--
src/scripts/pyolian/test_gen_namespace.template | 2 +-
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/scripts/gendoc/doc_enum.template
b/src/scripts/gendoc/doc_enum.template
index bdbb37a527..f7a11ee6c4 100644
--- a/src/scripts/gendoc/doc_enum.template
+++ b/src/scripts/gendoc/doc_enum.template
@@ -33,7 +33,7 @@ enum {
<code>
typedef enum {
<!--(for field in enum.enum_fields)-->
- ${field.c_name}$ = ${field.value.serialize}$,
+ ${field.c_constant}$ = ${field.value.serialize}$,
<!--(end)-->
} ${enum.name.replace('.', '_')}$;
</code>
diff --git a/src/scripts/gendoc/doc_macros.include
b/src/scripts/gendoc/doc_macros.include
index 64b5311e5a..507693179a 100644
--- a/src/scripts/gendoc/doc_macros.include
+++ b/src/scripts/gendoc/doc_macros.include
@@ -178,8 +178,8 @@ interface#!
#!#### FUNC_SCOPE(func)
######################################################
#!##################################################################
############
<!--(macro FUNC_SCOPE)-->
- <!--(if func.is_class)-->
- ''class method'' #!
+ <!--(if func.is_static)-->
+ ''static method'' #!
<!--(end)-->
<!--(if func.type == Eolian_Function_Type.PROPERTY)-->
<!--(if func.getter_scope ==
Eolian_Object_Scope.PROTECTED)-->
diff --git a/src/scripts/gendoc/gendoc.py
b/src/scripts/gendoc/gendoc.py
index 2ebaa605d4..bee5161f0b 100755
--- a/src/scripts/gendoc/gendoc.py
+++ b/src/scripts/gendoc/gendoc.py
@@ -41,7 +41,7 @@ _choices = ['start', 'classes', 'enums',
'structs', 'aliases']
parser.add_argument('--step', '-s', metavar='STEP', default=None,
choices=_choices,
help='A single step to run (default to all), '
- 'valid choices: '+ ', '.join(_choices))
+ 'valid choices: ' + ', '.join(_choices))
args = parser.parse_args()
@@ -64,6 +64,8 @@ if not eolian_db.all_eo_files_parse():
def cleanup_db():
global eolian_db
del eolian_db
+
+
atexit.register(cleanup_db)
@@ -72,14 +74,14 @@ def page_path_for_object(obj):
path = ['data', 'pages', 'develop', 'api']
for ns in obj.namespaces:
path.append(ns.lower())
- output_file = obj.short_name.lower() + '.txt'
- return os.path.join(args.root_path, *path, output_file)
+ output_filename = obj.short_name.lower() + '.txt'
+ return os.path.join(args.root_path, *path, output_filename)
# render a (temporary) page for analizying the namespaces hierarchy
t = Template('namespaces.template')
-nspaces = [ ns for ns in eolian_db.all_namespaces
- if ns.name.startswith(args.namespace) ]
+nspaces = [ns for ns in eolian_db.all_namespaces
+ if ns.name.startswith(args.namespace)]
tot_classes = tot_regulars = tot_abstracts = tot_mixins = tot_ifaces
= 0
tot_enums = tot_structs = tot_aliases = 0
@@ -113,7 +115,7 @@ totals = [
root_ns = eolian_db.namespace_get_by_name(args.namespace)
-output_file =
os.path.join(args.root_path,'data','pages','develop','api','namespac
es.txt')
+output_file = os.path.join(args.root_path, 'data', 'pages',
'develop', 'api', 'namespaces.txt')
t.render(output_file, args.verbose, root_ns=root_ns, totals=totals)
@@ -121,10 +123,10 @@ t.render(output_file, args.verbose,
root_ns=root_ns, totals=totals)
if args.step in ('start', None):
t = Template('doc_start.template')
- nspaces = [ ns for ns in eolian_db.all_namespaces
- if ns.name.startswith(args.namespace) ]
+ nspaces = [ns for ns in eolian_db.all_namespaces
+ if ns.name.startswith(args.namespace)]
- output_file =
os.path.join(args.root_path,'data','pages','develop','api','start.tx
t')
+ output_file = os.path.join(args.root_path, 'data', 'pages',
'develop', 'api', 'start.txt')
t.render(output_file, args.verbose, nspaces=nspaces)
diff --git a/src/scripts/pyolian/eolian.py
b/src/scripts/pyolian/eolian.py
index 2c23fa2c5b..a8b77e15e9 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -1154,7 +1154,7 @@ class Typedecl(Object):
class Enum_Type_Field(Object):
def __repr__(self):
- return "<eolian.Enum_Type_Field '{0.name}',
c_name='{0.c_name}'>".format(self)
+ return "<eolian.Enum_Type_Field '{0.name}',
c_constant='{0.c_constant}'>".format(self)
@cached_property
def c_constant(self):
diff --git a/src/scripts/pyolian/generator.py
b/src/scripts/pyolian/generator.py
index 0b7e8024e3..28138f531f 100755
--- a/src/scripts/pyolian/generator.py
+++ b/src/scripts/pyolian/generator.py
@@ -141,7 +141,7 @@ class Template(pyratemp.Template):
'Eolian_Typedecl_Type': eolian.Eolian_Typedecl_Type,
'Eolian_Type_Type': eolian.Eolian_Type_Type,
'Eolian_Type_Builtin_Type':
eolian.Eolian_Type_Builtin_Type,
- 'Eolian_C_Type_Type': eolian.Eolian_C_Type_Type,
+ # 'Eolian_C_Type_Type': eolian.Eolian_C_Type_Type,
'Eolian_Expression_Type':
eolian.Eolian_Expression_Type,
'Eolian_Expression_Mask':
eolian.Eolian_Expression_Mask,
'Eolian_Binary_Operator':
eolian.Eolian_Binary_Operator,
diff --git a/src/scripts/pyolian/test_gen_class.template
b/src/scripts/pyolian/test_gen_class.template
index cc0e845ab5..d53ae823e5 100644
--- a/src/scripts/pyolian/test_gen_class.template
+++ b/src/scripts/pyolian/test_gen_class.template
@@ -3,8 +3,7 @@
Class: ${cls.name}$ (${cls.short_name}$)
====================================================================
============
Class type: ${cls.type}$
-Base Class: ${cls.base_class.name if cls.base_class else None}$
-Inherits: ${', '.join([i.name for i in cls.inherits])}$
+Parent: ${cls.parent.name if cls.parent else None}$
Hierarchy: ${' => '.join([i.name for i in cls.hierarchy])}$
InheritsFull: ${', '.join([i.name for i in cls.inherits_full])}$
Namespace: ${cls.namespace}$
diff --git a/src/scripts/pyolian/test_gen_namespace.template
b/src/scripts/pyolian/test_gen_namespace.template
index 8cdb4f7ca7..27e6dcb533 100644
--- a/src/scripts/pyolian/test_gen_namespace.template
+++ b/src/scripts/pyolian/test_gen_namespace.template
@@ -59,7 +59,7 @@ Enums:
<!--(for typedecl in namespace.enums)-->
* ${typedecl.name}$
<!--(for field in typedecl.enum_fields)-->
- ${field.c_name}$ = ${field.value.serialize}$
+ ${field.c_constant}$ = ${field.value.serialize}$
<!--(end)-->
<!--(else)-->
no enums available
--
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
