Fix output locations

Ensure models-as-data are output to the correct location.

Author: lcartey

scripts/generate_standard_library_models/c/README.md

@@ -1,9 +1,11 @@
-## Generating Standard Library models
+## Generating C Standard Library models
 
 This directory contains a script for generating a models-as-data file from a plain text file containing standard library definitions copied from Appendix B of the C Programming Language standard.
 
 ### How to use
 
  1. Download a PDF of the desired C programming language standard.
  2. Copy each page individually into a text file (avoiding copying headers and footers).
- 3. Run `python3 generate_standard_library_models.py <lang-standard> <path-to-text-file> <output-file>`
+ 3. Run `python3 generate_c_standard_library_models.py <lang-standard> <path-to-input-text-file>`
+
+After running the script, an models-as-data file will be written to the cpp/common pack including the standard library definitions.

scripts/generate_standard_library_models/c/generate_c_standard_library_models.py

@@ -1,4 +1,5 @@
 from argparse import ArgumentParser
+from pathlib import Path
 import re
 import yaml
 
@@ -18,14 +19,10 @@
 parser.add_argument(
     "input_file", help="the input file containing the list of APIs copied from Appendix B of the C Standard Library document")
 
-parser.add_argument(
-    "output_file", help="the output file to write the models-as-data file to")
-
 args = parser.parse_args()
 
 input_file = args.input_file
 standard = args.standard
-output_file = args.output_file
 
 # Extract the header name from a header line
 header_regex = re.compile(r".*<(.+)>")
@@ -183,6 +180,11 @@ def map_size_vars(name):
     ]
 }
 
+generate_standard_library_home = Path(__file__).resolve().parent
+root = generate_standard_library_home.parent.parent.parent
+common_codingstandards_ext_output = root.joinpath('cpp', 'common', 'src', 'ext',f"std{ standard.lower() }.generated.names.model.yml")
+
 # Write the models-as-data file to YAML
-with open(output_file, 'w') as file:
-    yaml.dump(yaml_output, file, default_flow_style=None, width=3000)
+with open(common_codingstandards_ext_output, 'w') as file:
+    yaml.dump(yaml_output, file, default_flow_style=None, width=3000)
+    print("Wrote models-as-data file to " + str(common_codingstandards_ext_output) + " for " + standard + " C Standard Library.")

scripts/generate_standard_library_models/cpp/generate_cpp_standard_library_models.py

@@ -2,9 +2,9 @@
 from pathlib import Path
 import yaml
 
-generate_modules_home = Path(__file__).resolve().parent
-common_codingstandards_ext_output = generate_modules_home.parent.parent.joinpath(
-    'cpp', 'common', 'src', 'ext','stdcpp14.generated.names.model.yml')
+generate_standard_library_home = Path(__file__).resolve().parent
+root = generate_standard_library_home.parent.parent.parent
+common_codingstandards_ext_output = root.joinpath('cpp', 'common', 'src', 'ext','stdcpp14.generated.names.model.yml')
 
 queries = ["libraryTypeModel", "libraryFunctionModel", "libraryObjectModel", "libraryMemberVariableModel"]
 def load_spec(spec_file):
@@ -21,7 +21,7 @@ def load_spec(spec_file):
             "pack" : "codeql/common-cpp-coding-standards",
             "extensible" : query
         },
-        "data" : load_spec(generate_modules_home.joinpath(f"{query}.json"))["#select"]["tuples"]
+        "data" : load_spec(generate_standard_library_home.joinpath(f"{query}.json"))["#select"]["tuples"]
 
     })