Commit cd999622 authored by Philip Carns's avatar Philip Carns

move public headers to codes subdir in tree

parent d885a0e8
#ifndef CODESIOKERNELPARSER_H #ifndef CODESIOKERNELPARSER_H
#define CODESIOKERNELPARSER_H #define CODESIOKERNELPARSER_H
#include "codesparser.h" #include "codes/codesparser.h"
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner); YYLTYPE *CodesIOKernel_get_lloc (yyscan_t yyscanner);
int CodesIOKernel_lex_init (yyscan_t* scanner); int CodesIOKernel_lex_init (yyscan_t* scanner);
......
#ifndef CODES_H #ifndef CODES_H
#define CODES_H #define CODES_H
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
typedef enum { typeCon, typeId, typeOpr } nodeEnum; typedef enum { typeCon, typeId, typeOpr } nodeEnum;
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include <unistd.h> #include <unistd.h>
#include "iokernellang/CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "iokernellang/CodesIOKernelParser.h" #include "codes/CodesIOKernelParser.h"
#include "iokernellang/codeslexer.h" #include "codes/codeslexer.h"
#define CL_INST_MAX_ARGS 10 #define CL_INST_MAX_ARGS 10
......
...@@ -89,9 +89,6 @@ else ...@@ -89,9 +89,6 @@ else
AC_MSG_ERROR([Could not find usable ROSS installation, try --with-ross=DIR]) AC_MSG_ERROR([Could not find usable ROSS installation, try --with-ross=DIR])
fi fi
# put include files in a codes/ subdir
includedir="${includedir}/codes"
# #
# To reactivate rewriting of the codesparser.y file, # To reactivate rewriting of the codesparser.y file,
# uncomment next line. # uncomment next line.
......
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@/../
ross_cflags=@ROSS_CFLAGS@ ross_cflags=@ROSS_CFLAGS@
ross_ldflags=@ROSS_LDFLAGS@ ross_ldflags=@ROSS_LDFLAGS@
ross_libs=@ROSS_LIBS@ ross_libs=@ROSS_LIBS@
......
...@@ -7,8 +7,8 @@ EXTRA_DIST += src/iokernellang/codesparser.y.in \ ...@@ -7,8 +7,8 @@ EXTRA_DIST += src/iokernellang/codesparser.y.in \
src/iokernellang/codeslexer.l \ src/iokernellang/codeslexer.l \
src/modelconfig/configparser.y \ src/modelconfig/configparser.y \
src/modelconfig/configlex.l \ src/modelconfig/configlex.l \
src/util/quicklist.h \ codes/quicklist.h \
src/util/quickhash.h codes/quickhash.h
PHONY: maintainer-clean-local PHONY: maintainer-clean-local
maintainer-clean-local:: maintainer-clean-local::
...@@ -36,45 +36,46 @@ src/iokernellang/codesparser.c src/iokernellang/codesparser.h: src/iokernellang/ ...@@ -36,45 +36,46 @@ src/iokernellang/codesparser.c src/iokernellang/codesparser.h: src/iokernellang/
EXTRA_DIST += src/iokernellang/codesparser.y EXTRA_DIST += src/iokernellang/codesparser.y
include_HEADERS = \ nobase_include_HEADERS = \
src/iokernellang/CodesKernelHelpers.h \ codes/CodesKernelHelpers.h \
src/iokernellang/CodesIOKernelContext.h \ codes/CodesIOKernelContext.h \
src/iokernellang/CodesIOKernelParser.h \ codes/CodesIOKernelParser.h \
src/iokernellang/CodesIOKernelTypes.h \ codes/CodesIOKernelTypes.h \
src/iokernellang/codeslexer.h \ codes/codeslexer.h \
src/modelconfig/txt_configfile.h \ codes/txt_configfile.h \
src/util/tools.h \ codes/tools.h \
src/logging/codeslogging.h \ codes/codeslogging.h \
src/logging/timeline.h \ codes/timeline.h \
src/iokernellang/codesparser.h codes/codesparser.h \
codes/quickhash.h \
codes/configfile.h \
codes/quicklist.h
src_libcodes_base_a_SOURCES = \ src_libcodes_base_a_SOURCES = \
src/iokernellang/codesparser.h \ codes/codesparser.h \
src/iokernellang/codesparser.c \ src/iokernellang/codesparser.c \
src/iokernellang/codeslexer.h \ codes/codeslexer.h \
src/iokernellang/codeslexer.c \ src/iokernellang/codeslexer.c \
src/iokernellang/codesImpl.c \ src/iokernellang/codesImpl.c \
src/iokernellang/CodesIOKernelContext.h \ codes/CodesIOKernelContext.h \
src/iokernellang/CodesIOKernelParser.h \ codes/CodesIOKernelParser.h \
src/iokernellang/CodesIOKernelTypes.h \ codes/CodesIOKernelTypes.h \
src/iokernellang/CodesKernelHelpers.h \ codes/CodesKernelHelpers.h \
src/iokernellang/CodesKernelHelpers.c \ src/iokernellang/CodesKernelHelpers.c \
src/modelconfig/configlex.c \ src/modelconfig/configlex.c \
src/modelconfig/configlex.h \ src/modelconfig/configlex.h \
src/modelconfig/configparser.c \ src/modelconfig/configparser.c \
src/modelconfig/configparser.h \ src/modelconfig/configparser.h \
src/modelconfig/configfile.c \ src/modelconfig/configfile.c \
src/modelconfig/configfile.h \
src/modelconfig/configglue.h \ src/modelconfig/configglue.h \
src/modelconfig/configglue.c \ src/modelconfig/configglue.c \
src/modelconfig/configfile.h \ codes/configfile.h \
src/modelconfig/configstore.h \ src/modelconfig/configstore.h \
src/modelconfig/configstore.c \ src/modelconfig/configstore.c \
src/modelconfig/configstoreadapter.h \ src/modelconfig/configstoreadapter.h \
src/modelconfig/configstoreadapter.c \ src/modelconfig/configstoreadapter.c \
src/modelconfig/txt_configfile.c \ codes/txt_configfile.h \
src/modelconfig/txt_configfile.h \ codes/tools.h \
src/util/tools.h \
src/util/tools.c \ src/util/tools.c \
src/util/interval-merge-tree.h \ src/util/interval-merge-tree.h \
src/util/interval-merge-tree.c \ src/util/interval-merge-tree.c \
...@@ -82,7 +83,7 @@ src_libcodes_base_a_SOURCES = \ ...@@ -82,7 +83,7 @@ src_libcodes_base_a_SOURCES = \
src/util/red-black-tree.c \ src/util/red-black-tree.c \
src/util/codes-callbacks.h \ src/util/codes-callbacks.h \
src/util/codes-callbacks.c \ src/util/codes-callbacks.c \
src/logging/codeslogging.h \ codes/codeslogging.h \
src/logging/codeslogging.c \ src/logging/codeslogging.c \
src/logging/timeline.h \ codes/timeline.h \
src/logging/timeline.c src/logging/timeline.c
#include "CodesKernelHelpers.h" #include "codes/CodesKernelHelpers.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "CodesIOKernelParser.h" #include "codes/CodesIOKernelParser.h"
int64_t ex( int64_t ex(
nodeType * p) nodeType * p)
......
%{ %{
#include <stdlib.h> #include <stdlib.h>
#include "CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "CodesIOKernelParser.h" #include "codes/CodesIOKernelParser.h"
#define YY_NO_INPUT #define YY_NO_INPUT
......
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
/* prototypes */ /* prototypes */
nodeType *opr(int64_t oper, int64_t nops, ...); nodeType *opr(int64_t oper, int64_t nops, ...);
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
/* prototypes */ /* prototypes */
nodeType *opr(int64_t oper, int64_t nops, ...); nodeType *opr(int64_t oper, int64_t nops, ...);
...@@ -56,7 +56,7 @@ int * group_size = NULL; ...@@ -56,7 +56,7 @@ int * group_size = NULL;
%type <nPtr> stmt expr stmt_list %type <nPtr> stmt expr stmt_list
%{ %{
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner); int CodesIOKernel_lex(YYSTYPE * lvalp, YYLTYPE * llocp, void * scanner);
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "CodesIOKernelTypes.h" #include "codes/CodesIOKernelTypes.h"
#include "CodesIOKernelContext.h" #include "codes/CodesIOKernelContext.h"
/* prototypes */ /* prototypes */
nodeType *opr(int64_t oper, int64_t nops, ...); nodeType *opr(int64_t oper, int64_t nops, ...);
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <execinfo.h> #include <execinfo.h>
#endif #endif
#include "logging/codeslogging.h" #include "codes/codeslogging.h"
#include <pthread.h> #include <pthread.h>
/** controls whether debugging is on or off */ /** controls whether debugging is on or off */
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "timeline.h" #include "codes/timeline.h"
// If timeline is not enabled, all functions are defined to noops // If timeline is not enabled, all functions are defined to noops
#if TIMELINE_ENABLED == 1 #if TIMELINE_ENABLED == 1
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include "configfile.h" #include "codes/configfile.h"
#include "txt_configfile.h" #include "codes/txt_configfile.h"
static int cf_equal_helper (ConfigHandle h1, SectionHandle s1, ConfigHandle h2, static int cf_equal_helper (ConfigHandle h1, SectionHandle s1, ConfigHandle h2,
SectionHandle s2) SectionHandle s2)
......
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "configglue.h" #include "configglue.h"
#include "util/tools.h" #include "codes/tools.h"
int cfgp_lex_error (ParserParams * p, int lineno, int colno, const char * msg) int cfgp_lex_error (ParserParams * p, int lineno, int colno, const char * msg)
{ {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* Common header for parser and lexer */ /* Common header for parser and lexer */
#include "configfile.h" #include "codes/configfile.h"
typedef struct typedef struct
......
...@@ -481,7 +481,7 @@ static yyconst flex_int16_t yy_chk[111] = ...@@ -481,7 +481,7 @@ static yyconst flex_int16_t yy_chk[111] =
#include <string.h> #include <string.h>
#include "configglue.h" #include "configglue.h"
#include "configparser.h" #include "configparser.h"
#include "util/tools.h" #include "codes/tools.h"
#define YY_EXTRA_TYPE ParserParams * #define YY_EXTRA_TYPE ParserParams *
......
%{ %{
#include <string.h> #include <string.h>
#include "configglue.h" #include "src/modelconfig/configglue.h"
#include "configparser.h" #include "src/modelconfig/configparser.h"
#include "util/tools.h" #include "codes/tools.h"
#define YY_EXTRA_TYPE ParserParams * #define YY_EXTRA_TYPE ParserParams *
......
...@@ -176,7 +176,7 @@ typedef struct YYLTYPE ...@@ -176,7 +176,7 @@ typedef struct YYLTYPE
#include "configlex.h" #include "configlex.h"
#include "configglue.h" #include "configglue.h"
#include "util/tools.h" #include "codes/tools.h"
#if defined __GNUC__ #if defined __GNUC__
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
......
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
#include <assert.h> #include <assert.h>
#include "configlex.h" #include "src/modelconfig/configlex.h"
#include "configglue.h" #include "src/modelconfig/configglue.h"
#include "util/tools.h" #include "codes/tools.h"
#if defined __GNUC__ #if defined __GNUC__
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <string.h> #include <string.h>
#include "configstoreadapter.h" #include "configstoreadapter.h"
#include "util/tools.h" #include "codes/tools.h"
#include "configstore.h" #include "configstore.h"
static int cfsa_getKey (void * handle, SectionHandle section, const char * name, static int cfsa_getKey (void * handle, SectionHandle section, const char * name,
......
#ifndef SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H #ifndef SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H
#define SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H #define SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H
#include "configfile.h" #include "codes/configfile.h"
#include "configstore.h" #include "configstore.h"
#ifdef __cplusplus #ifdef __cplusplus
......
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include "txt_configfile.h" #include "codes/txt_configfile.h"
#include "util/tools.h" #include "codes/tools.h"
#include "configglue.h" #include "configglue.h"
#include "configparser.h" #include "configparser.h"
#include "configlex.h" #include "configlex.h"
......
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "tools.h" #include "codes/tools.h"
char * safe_strncpy(char * buf, const char * source, unsigned int size) char * safe_strncpy(char * buf, const char * source, unsigned int size)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment