loci: remove config_check and code_gen_config
There's nothing to configure.
diff --git a/c_gen/c_code_gen.py b/c_gen/c_code_gen.py
index d1e4348..ca75e2f 100644
--- a/c_gen/c_code_gen.py
+++ b/c_gen/c_code_gen.py
@@ -36,7 +36,6 @@
from generic_utils import *
from c_gen import flags, type_maps, c_type_maps
import c_gen.loxi_utils_legacy as loxi_utils
-from c_gen.loxi_utils_legacy import config_check
import loxi_globals
import c_gen.identifiers as identifiers
@@ -64,18 +63,6 @@
"""
return loxi_utils.enum_name(cls)
-def member_returns_val(cls, m_name):
- """
- Should get accessor return a value rather than void
- @param cls The class name
- @param m_name The member name
- @return True if of_g config and the specific member allow a
- return value. Otherwise False
- """
- m_type = of_g.unified[cls]["union"][m_name]["m_type"]
- return (config_check("get_returns") =="value" and
- m_type in of_g.of_scalar_types)
-
# TODO serialize match outside accessor?
def accessor_return_type(a_type, m_type):
if loxi_utils.accessor_returns_error(a_type, m_type):
@@ -984,8 +971,6 @@
member = of_g.unified[cls]["union"][m_name]
m_type = member["m_type"]
rv = "int"
- if member_returns_val(cls, m_name):
- rv = m_type
if m_type[-2:] == "_t":
m_type = m_type[:-2]
diff --git a/c_gen/loci_utils.py b/c_gen/loci_utils.py
index bc3092f..686fb0f 100644
--- a/c_gen/loci_utils.py
+++ b/c_gen/loci_utils.py
@@ -96,30 +96,6 @@
def member_type_is_octets(cls, m_name):
return member_base_type(cls, m_name) == "of_octets_t"
-def member_returns_val(cls, m_name):
- """
- Should get accessor return a value rather than void
- @param cls The class name
- @param m_name The member name
- @return True if of_g config and the specific member allow a
- return value. Otherwise False
- """
- m_type = of_g.unified[cls]["union"][m_name]["m_type"]
- return (config_check("get_returns") =="value" and
- m_type in of_g.of_scalar_types)
-
-def config_check(str, dictionary = of_g.code_gen_config):
- """
- Return config value if in dictionary; else return False.
- @param str The lookup index
- @param dictionary The dict to check; use code_gen_config if None
- """
-
- if str in dictionary:
- return dictionary[str]
-
- return False
-
def h_file_to_define(name):
"""
Convert a .h file name to the define used for the header
diff --git a/c_gen/loxi_utils_legacy.py b/c_gen/loxi_utils_legacy.py
index 9abca52..6a0fb2e 100644
--- a/c_gen/loxi_utils_legacy.py
+++ b/c_gen/loxi_utils_legacy.py
@@ -322,30 +322,6 @@
def member_type_is_octets(cls, m_name):
return member_base_type(cls, m_name) == "of_octets_t"
-def member_returns_val(cls, m_name):
- """
- Should get accessor return a value rather than void
- @param cls The class name
- @param m_name The member name
- @return True if of_g config and the specific member allow a
- return value. Otherwise False
- """
- m_type = of_g.unified[cls]["union"][m_name]["m_type"]
- return (config_check("get_returns") =="value" and
- m_type in of_g.of_scalar_types)
-
-def config_check(str, dictionary = of_g.code_gen_config):
- """
- Return config value if in dictionary; else return False.
- @param str The lookup index
- @param dictionary The dict to check; use code_gen_config if None
- """
-
- if str in dictionary:
- return dictionary[str]
-
- return False
-
def h_file_to_define(name):
"""
Convert a .h file name to the define used for the header
diff --git a/c_gen/of_g_legacy.py b/c_gen/of_g_legacy.py
index 482eb28..6f0947c 100644
--- a/c_gen/of_g_legacy.py
+++ b/c_gen/of_g_legacy.py
@@ -74,16 +74,6 @@
# and use a call-by-variable parameter
#
-# @fixme These are still very C specific and should probably either
-# go into lang_c.py or be swallowed by command line option parsing
-code_gen_config = dict(
- use_obj_id=False,
- use_static_inlines=False,
- copy_semantics="read", # Only read implemented: read, write, grow
- encoded_typedefs=False,
- get_returns="error", # Only error implemented; error, value, void
-)
-
## These members do not get normal accessors
skip_members = ["version", "type", "length", "err_type", "stats_type", "len",
diff --git a/lang_c.py b/lang_c.py
index b8dcc36..c0e44f8 100644
--- a/lang_c.py
+++ b/lang_c.py
@@ -116,46 +116,6 @@
'locitest/Makefile': static,
}
-################################################################
-#
-# Configuration related
-#
-################################################################
-
-def config_check(str, dictionary = of_g.code_gen_config):
- """
- Return config value if in dictionary; else return False.
- @param str The lookup index
- @param dictionary The dict to check; use code_gen_config if None
- """
-
- if str in dictionary:
- return dictionary[str]
-
- return False
-
-def config_sanity_check():
- """
- Check the configuration for basic consistency
-
- @fixme Needs update for generic language support
- """
-
- rv = True
- # For now, only "error" supported for get returns
- if config_check("copy_semantics") != "read":
- debug("Only 'read' is supported for copy_semantics");
- rv = False
- if config_check("get_returns") != "error":
- debug("Only 'error' is supported for get-accessor return types\m");
- rv = False
- if config_check("use_obj_id"):
- debug("use_obj_id is set but not yet supported (change \
-config_sanity_check if it is)")
- rv = False
-
- return rv
-
def generate(install_dir):
build_of_g.initialize_versions()
build_of_g.build_ordered_classes()