Skip to content

Commit 6092c9b

Browse files
mpictormpictor
committed
move some functions from express.[ch] to info.[ch]
1 parent 8f57958 commit 6092c9b

File tree

7 files changed

+64
-40
lines changed

7 files changed

+64
-40
lines changed

‎cmake/schema_scanner/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ set( schema_scanner_src
3030
${SC_ROOT}/src/express/linklist.c
3131
${SC_ROOT}/src/express/memory.c
3232
${SC_ROOT}/src/express/object.c
33+
${SC_ROOT}/src/express/info.c
3334
${SC_ROOT}/src/express/resolve.c
3435
${SC_ROOT}/src/express/schema.c
3536
${SC_ROOT}/src/express/scope.c

‎include/express/express.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,9 @@ extern SC_EXPRESS_EXPORT void EXPRESSparse PROTO( ( Express, FILE *, ch
255255
extern SC_EXPRESS_EXPORT void EXPRESSinitialize PROTO( ( void ) );
256256
extern SC_EXPRESS_EXPORT void EXPRESScleanup PROTO( ( void ) );
257257
extern SC_EXPRESS_EXPORT void EXPRESSresolve PROTO( ( Express ) );
258-
extern SC_EXPRESS_EXPORT char * EXPRESSversion PROTO( ( void ) );
259-
extern SC_EXPRESS_EXPORT int EXPRESS_fail PROTO( ( Express ) );
260-
extern SC_EXPRESS_EXPORT int EXPRESS_succeed PROTO( ( Express ) );
258+
extern SC_EXPRESS_EXPORT int EXPRESS_fail( Express model );
259+
extern SC_EXPRESS_EXPORT int EXPRESS_succeed( Express model );
261260
extern void EXPRESSinit_init PROTO( ( void ) );
262-
extern SC_EXPRESS_EXPORT void EXPRESSusage( int _exit ); /**< exit unless _exit is non-zero */
263261
extern SC_EXPRESS_EXPORT void build_complex( Express );
264262

265263
#endif /*EXPRESS_H*/

‎include/express/info.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#ifndef INFO_H
2+
#define INFO_H
3+
4+
#include "sc_export.h"
5+
/** \file info.h
6+
* informative functions that were in express.c/express.h
7+
*/
8+
9+
extern SC_EXPRESS_EXPORT char * EXPRESSversion( void );
10+
11+
/** print usage message, then exit if _exit is non-zero */
12+
extern SC_EXPRESS_EXPORT void EXPRESSusage( int _exit );
13+
14+
#endif /* INFO_H */

‎src/express/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ set(EXPRESS_SOURCES
9292
object.c
9393
express.c
9494
ordered_attrs.cc
95+
info.c
9596
)
9697

9798
# TODO

‎src/express/error.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,19 @@
5454
#include <sc_memmgr.h>
5555
#include <stdlib.h>
5656
#include <setjmp.h>
57+
#include <signal.h>
58+
#include <string.h>
5759

58-
#include "signal.h"
59-
#include "express/error.h"
60-
#include "string.h"
61-
#include "express/linklist.h"
6260
#ifdef __STDC__
6361
#include <stdarg.h>
6462
#else
6563
#include <varargs.h>
6664
#endif
6765

66+
#include "express/error.h"
67+
#include "express/info.h"
68+
#include "express/linklist.h"
69+
6870

6971
bool __ERROR_buffer_errors = false;
7072
const char * current_filename = "stdin";

‎src/express/express.c‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,12 @@
6969
*/
7070

7171
#include "sc_memmgr.h"
72-
#include "express/basic.h"
73-
#include "sc_version_string.h"
7472
#include <ctype.h>
7573
#include <stdlib.h>
7674
#include <setjmp.h>
7775
#include <errno.h>
7876

77+
#include "express/basic.h"
7978
#include "express/express.h"
8079
#include "express/resolve.h"
8180
#include "stack.h"
@@ -249,39 +248,9 @@ void SCOPEinitialize( void );
249248

250249
static Express PARSERrun PROTO( ( char *, FILE * ) );
251250

252-
char * EXPRESSversion( void ) {
253-
return( "Express Language, IS (N65), October 24, 1994" );
254-
}
255251
/** name specified on command line */
256252
char * input_filename = 0;
257253

258-
void EXPRESSusage( int _exit ) {
259-
fprintf( stderr, "usage: %s [-v] [-d #] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
260-
fprintf( stderr, "where\t-v produces the following version description:\n" );
261-
fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode\n", EXPRESSprogram_name, sc_version );
262-
fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
263-
fprintf( stderr, "\t-p turns on printing when processing certain objects (see below)\n" );
264-
fprintf( stderr, "\t-w warning enable\n" );
265-
fprintf( stderr, "\t-i warning ignore\n" );
266-
fprintf( stderr, "and <warning> is one of:\n" );
267-
fprintf( stderr, "\tnone\n\tall\n" );
268-
LISTdo( ERRORwarnings, opt, Error_Warning )
269-
fprintf( stderr, "\t%s\n", opt->name );
270-
LISTod
271-
fprintf( stderr, "and <object_type> is one or more of:\n" );
272-
fprintf( stderr, " e entity\n" );
273-
fprintf( stderr, " p procedure\n" );
274-
fprintf( stderr, " r rule\n" );
275-
fprintf( stderr, " f function\n" );
276-
fprintf( stderr, " t type\n" );
277-
fprintf( stderr, " s schema or file\n" );
278-
fprintf( stderr, " # pass #\n" );
279-
fprintf( stderr, " E everything (all of the above)\n" );
280-
if( _exit ) {
281-
exit( 2 );
282-
}
283-
}
284-
285254
int EXPRESS_fail( Express model ) {
286255
ERRORflush_messages();
287256

‎src/express/info.c‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#include <stdio.h>
2+
#include <stdlib.h>
3+
4+
#include "express/info.h"
5+
#include "express/express.h"
6+
7+
#include "sc_version_string.h"
8+
9+
char * EXPRESSversion( void ) {
10+
return( "Express Language, IS (N65), October 24, 1994" );
11+
}
12+
13+
void EXPRESSusage( int _exit ) {
14+
fprintf( stderr, "usage: %s [-v] [-d #] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
15+
fprintf( stderr, "where\t-v produces the following version description:\n" );
16+
fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode\n", EXPRESSprogram_name, sc_version );
17+
fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
18+
fprintf( stderr, "\t-p turns on printing when processing certain objects (see below)\n" );
19+
fprintf( stderr, "\t-w warning enable\n" );
20+
fprintf( stderr, "\t-i warning ignore\n" );
21+
fprintf( stderr, "and <warning> is one of:\n" );
22+
fprintf( stderr, "\tnone\n\tall\n" );
23+
LISTdo( ERRORwarnings, opt, Error_Warning )
24+
fprintf( stderr, "\t%s\n", opt->name );
25+
LISTod
26+
fprintf( stderr, "and <object_type> is one or more of:\n" );
27+
fprintf( stderr, " e entity\n" );
28+
fprintf( stderr, " p procedure\n" );
29+
fprintf( stderr, " r rule\n" );
30+
fprintf( stderr, " f function\n" );
31+
fprintf( stderr, " t type\n" );
32+
fprintf( stderr, " s schema or file\n" );
33+
fprintf( stderr, " # pass #\n" );
34+
fprintf( stderr, " E everything (all of the above)\n" );
35+
if( _exit ) {
36+
exit( 2 );
37+
}
38+
}
39+

0 commit comments

Comments
 (0)