Merge branch 'develop' into main

Author: francisco-ortin

core/generators.py

@@ -388,9 +388,11 @@ def generate_stmt_return(program, function, exp=None):
         if isinstance(c_type, ast.SignedInt) and probs_helper.random_value(probs.int_emulate_bool):
             value = probs_helper.random_value({0: 0.5, 1: 0.5})
             exp = ast.Literal("/* EMULATED BOOL LITERAL */ ({}) {}".format(c_type.name, value), c_type)
-        else: 
-            exp = generate_expression(program, function, c_type, probs.return_exp_depth_prob)
-    return ast.Return(exp, c_type)
+            return ast.Return(exp, c_type)
+    elif not isinstance(c_type, ast.Void):  # return <expression>;
+        exp = generate_expression(program, function, c_type, probs.return_exp_depth_prob)
+        return ast.Return(exp, c_type)
+    return ast.Return()  # return; (without expression)
 
 
 def generate_stmt_block(program: Program, function: Function, stmt_depth: int) -> Block:
@@ -603,7 +605,6 @@ def generate_program():
     program = ast.Program()
     program.main = main_function = ast.Function("main", ast.SignedInt(), [])
     for i in range(number_statements):
-        print_if_verbose("." if i % 1000 else "\n", end="")
         program.main.stmts.append(generate_stmt_func(program, main_function))
     main_function.stmts.append(generate_stmt_return(program, main_function, exp=0))
     return program

docs/run.html

@@ -189,48 +189,58 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <div class="section" id="module-run.1_function_each_type">
 <span id="run-1-function-each-type-module"></span><h2>run.1-function-each-type module<a class="headerlink" href="#module-run.1_function_each_type" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator to create a particular number of functions.
-It creates a program using the <code class="docutils literal notranslate"><span class="pre">1-function-each-type-10.json</span></code> file, running different visitors.</p>
+It creates a program using the <code class="docutils literal notranslate"><span class="pre">1_function-each-type-10.json</span></code> file, running different visitors.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.1_function_each_type</span></code>.</p>
 </div>
 <div class="section" id="module-run.15_function_each_type">
 <span id="run-15-function-each-type-module"></span><h2>run.15-function-each-type module<a class="headerlink" href="#module-run.15_function_each_type" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator to create a particular number of functions.
-It creates a program using the <code class="docutils literal notranslate"><span class="pre">15-function-each-type.json</span></code> file, running different visitors.</p>
+It creates a program using the <code class="docutils literal notranslate"><span class="pre">15-function-each-type.json</span></code> file, running different visitors.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.15_function_each_type</span></code>.</p>
 </div>
 <div class="section" id="module-run.2000_function_void_no_void">
 <span id="run-2000-function-void-no-void-module"></span><h2>run.2000-function-void-no-void module<a class="headerlink" href="#module-run.2000_function_void_no_void" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator to create a particular number of functions.
-It creates a program using the <code class="docutils literal notranslate"><span class="pre">2000-function-void-no-void.json</span></code> file, running different visitors.</p>
+It creates a program using the <code class="docutils literal notranslate"><span class="pre">2000-function-void-no-void.json</span></code> file, running different visitors.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.2000_function_void_no_void</span></code>.</p>
 </div>
 <div class="section" id="module-run.300_function_each_type">
 <span id="run-300-function-each-type-module"></span><h2>run.300-function-each-type module<a class="headerlink" href="#module-run.300_function_each_type" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator to create a particular number of functions.
-It creates a program using the <code class="docutils literal notranslate"><span class="pre">300-function-each-type.json</span></code> file, running different visitors.</p>
+It creates a program using the <code class="docutils literal notranslate"><span class="pre">300-function-each-type.json</span></code> file, running different visitors.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.300_function_each_type</span></code>.</p>
 </div>
 <div class="section" id="module-run.article">
 <span id="run-article-module"></span><h2>run.article module<a class="headerlink" href="#module-run.article" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator to create particular functions.
-It creates a program using the <code class="docutils literal notranslate"><span class="pre">article.json</span></code> file, running different visitors.</p>
+It creates a program using the <code class="docutils literal notranslate"><span class="pre">article.json</span></code> file, running different visitors.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.article</span></code>.</p>
 </div>
 <div class="section" id="module-run.defaults">
 <span id="run-defaults-module"></span><h2>run.defaults module<a class="headerlink" href="#module-run.defaults" title="Permalink to this headline">¶</a></h2>
 <p>Example execution of Cnerator passing no parameters.
-It creates a random program considering the default probabilities.</p>
+It creates a random program considering the default probabilities.
+Run it from the parent folder with <a href="#id1"><span class="problematic" id="id2">``</span></a>python -m run.defaults`.</p>
 </div>
 <div class="section" id="module-run.defaults_one_file">
 <span id="run-defaults-one-file-module"></span><h2>run.defaults_one_file module<a class="headerlink" href="#module-run.defaults_one_file" title="Permalink to this headline">¶</a></h2>
-<p>Example execution of Cnerator passing no parameters but generation in one file (<code class="docutils literal notranslate"><span class="pre">-n</span> <span class="pre">1</span></code>).</p>
+<p>Example execution of Cnerator passing no parameters but generation in one file (<code class="docutils literal notranslate"><span class="pre">-n</span> <span class="pre">1</span></code>).
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.defaults_one_file</span></code>.</p>
 </div>
 <div class="section" id="module-run.help">
 <span id="run-help-module"></span><h2>run.help module<a class="headerlink" href="#module-run.help" title="Permalink to this headline">¶</a></h2>
-<p>Example execution of Cnerator passing the <code class="docutils literal notranslate"><span class="pre">--help</span></code> parameter.</p>
+<p>Example execution of Cnerator passing the <code class="docutils literal notranslate"><span class="pre">--help</span></code> parameter.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.help</span></code>.</p>
 </div>
 <div class="section" id="module-run.probs">
 <span id="run-probs-module"></span><h2>run.probs module<a class="headerlink" href="#module-run.probs" title="Permalink to this headline">¶</a></h2>
-<p>Example execution of Cnerator passing the <code class="docutils literal notranslate"><span class="pre">-p</span></code> parameter to specify the probabilities of two language constructs.</p>
+<p>Example execution of Cnerator passing the <code class="docutils literal notranslate"><span class="pre">-p</span></code> parameter to specify the probabilities of two language constructs.
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.probs</span></code>.</p>
 </div>
 <div class="section" id="module-run.probs_file">
 <span id="run-probs-file-module"></span><h2>run.probs_file module<a class="headerlink" href="#module-run.probs_file" title="Permalink to this headline">¶</a></h2>
-<p>Example execution of Cnerator specifying probabilities in a json file (<code class="docutils literal notranslate"><span class="pre">example_probs.json</span></code>).</p>
+<p>Example execution of Cnerator specifying probabilities in a json file (<code class="docutils literal notranslate"><span class="pre">example_probs.json</span></code>).
+Run it from the parent folder with <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">-m</span> <span class="pre">run.probs_file</span></code>.</p>
 </div>
 </div>
 

docs/searchindex.js

@@ -4,6 +4,7 @@
 """
 Example execution of Cnerator to create a particular number of functions.
 It creates a program using the ``15-function-each-type.json`` file, running different visitors.
+Run it from the parent folder with ``python -m run.15_function_each_type``.
 """
 
 import sys
@@ -13,9 +14,9 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-f')      # controlled function generation
-    sys.argv.append('../json/functions/15-function-each-type.json')  # controlled function generation
+    sys.argv.append('json/functions/15-function-each-type.json')  # controlled function generation
     sys.argv.append('-V')      # visitor post-processing
     sys.argv.append('visitors.func_to_proc:visitors.return_instrumentation:visitors.fix_ptr_literal')
     if VERBOSE:

run/15_function_each_type.py

@@ -3,7 +3,8 @@
 
 """
 Example execution of Cnerator to create a particular number of functions.
-It creates a program using the ``1-function-each-type-10.json`` file, running different visitors.
+It creates a program using the ``1_function-each-type-10.json`` file, running different visitors.
+Run it from the parent folder with ``python -m run.1_function_each_type``.
 """
 
 import sys
@@ -13,9 +14,9 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-f')      # controlled function generation
-    sys.argv.append('../json/functions/1-function-each-type.json')  # controlled function generation
+    sys.argv.append('json/functions/1-function-each-type.json')  # controlled function generation
     sys.argv.append('-V')      # visitor post-processing
     sys.argv.append('visitors.func_to_proc:visitors.return_instrumentation:visitors.fix_ptr_literal')
     sys.argv.append('-n')      # generate all the code in one file

run/1_function_each_type.py

@@ -4,6 +4,7 @@
 """
 Example execution of Cnerator to create a particular number of functions.
 It creates a program using the ``2000-function-void-no-void.json`` file, running different visitors.
+Run it from the parent folder with ``python -m run.2000_function_void_no_void``.
 """
 
 import sys
@@ -13,9 +14,9 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-f')      # controlled function generation
-    sys.argv.append('../json/functions/2000-function-void-no-void.json')  # controlled function generation
+    sys.argv.append('json/functions/2000-function-void-no-void.json')  # controlled function generation
     sys.argv.append('-V')      # visitor post-processing
     sys.argv.append('visitors.func_to_proc:visitors.return_instrumentation:visitors.fix_ptr_literal')
     if VERBOSE:

run/2000_function_void_no_void.py

@@ -4,6 +4,7 @@
 """
 Example execution of Cnerator to create a particular number of functions.
 It creates a program using the ``300-function-each-type.json`` file, running different visitors.
+Run it from the parent folder with ``python -m run.300_function_each_type``.
 """
 
 import sys
@@ -13,9 +14,9 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-f')      # controlled function generation
-    sys.argv.append('../json/functions/300-function-each-type.json')  # controlled function generation
+    sys.argv.append('json/functions/300-function-each-type.json')  # controlled function generation
     sys.argv.append('-V')      # visitor post-processing
     sys.argv.append('visitors.func_to_proc:visitors.return_instrumentation:visitors.fix_ptr_literal')
     if VERBOSE:

run/300_function_each_type.py

@@ -4,22 +4,23 @@
 """
 Example execution of Cnerator to create particular functions.
 It creates a program using the ``article.json`` file, running different visitors.
+Run it from the parent folder with ``python -m run.article``.
 """
 
-import sys
 import cnerator
+import sys
 
 VERBOSE = True
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-f')      # controlled function generation
-    sys.argv.append('../json/functions/article.json')  # controlled function generation
+    sys.argv.append('json/functions/article.json')  # controlled function generation
     sys.argv.append('-V')      # visitor post-processing
     sys.argv.append('visitors.return_instrumentation:visitors.fix_ptr_literal')  # visitor post-processing
     sys.argv.append('-P')      # probabilities file
-    sys.argv.append('../json/probabilities/article.json')  # probabilities file
+    sys.argv.append('json/probabilities/article.json')  # probabilities file
     sys.argv.append('-n')      # generate all the code in one file
     sys.argv.append('1')       # generate all the code in one file
     if VERBOSE:

run/article.py

@@ -4,6 +4,7 @@
 """
 Example execution of Cnerator passing no parameters.
 It creates a random program considering the default probabilities.
+Run it from the parent folder with ``python -m run.defaults`.
 """
 
 import sys
@@ -13,7 +14,7 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     if VERBOSE:
         sys.argv.append("-v")
     cnerator.main()

run/defaults.py

@@ -3,6 +3,7 @@
 
 """
 Example execution of Cnerator passing no parameters but generation in one file (``-n 1``).
+Run it from the parent folder with ``python -m run.defaults_one_file``.
 """
 
 import sys
@@ -12,7 +13,7 @@
 
 if __name__ == "__main__":
     sys.argv.append('-O')      # generate output files in ../out
-    sys.argv.append('../out')  # generate output files in ../out
+    sys.argv.append('out')  # generate output files in ../out
     sys.argv.append('-n')      # generate all the code in one file
     sys.argv.append('1')       # generate all the code in one file
     if VERBOSE: