Skip to content

Commit

Permalink
Split scanner.{c,h} into scanner.{c,h} and io.{c,h}
Browse files Browse the repository at this point in the history
* scanner.{h,c} should now only contain code that is part of the
  GAP source scanner
* io.{h,c} should now contain code that deals with input that goes
  into the GAP interpreter, and output from the interpreter.

This requires some manoeuvering (and this commit has to be quite big
to keep things compiling). More cleanup and refactoring commits to
follow.
  • Loading branch information
markuspf authored and fingolfin committed Nov 21, 2017
1 parent a0a3ba8 commit 7faf0fc
Show file tree
Hide file tree
Showing 11 changed files with 3,223 additions and 3,137 deletions.
1 change: 1 addition & 0 deletions Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ SOURCES += src/hookintrprtr.c
SOURCES += src/integer.c
SOURCES += src/intfuncs.c
SOURCES += src/intrprtr.c
SOURCES += src/io.c
SOURCES += src/iostream.c
SOURCES += src/listfunc.c
SOURCES += src/listoper.c
Expand Down
1 change: 1 addition & 0 deletions src/compiled.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ extern "C" {

#include <src/gasman.h> /* garbage collector */
#include <src/objects.h> /* objects */
#include <src/io.h> /* input and output */
#include <src/scanner.h> /* scanner */

#include <src/gap.h> /* error handling, initialisation */
Expand Down
1 change: 1 addition & 0 deletions src/gap.c
Original file line number Diff line number Diff line change
Expand Up @@ -3087,6 +3087,7 @@ static InitInfoFunc InitFuncsBuiltinModules[] = {
InitInfoHookIntrprtr,

/* scanner, reader, interpreter, coder, caller, compiler */
InitInfoIO,
InitInfoScanner,
InitInfoRead,
InitInfoCalls,
Expand Down
3 changes: 2 additions & 1 deletion src/gapstate.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@

#include <src/system.h>
#include <src/gasman.h>
#include <src/scanner.h>
#include <src/io.h> // for TypInputFile and friends
#include <src/scanner.h> // for MAX_VALUE_LEN

#if defined(HPCGAP)
#include <src/hpc/serialize.h>
Expand Down
2 changes: 1 addition & 1 deletion src/gasman.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
#include <src/gasman.h> /* garbage collector */

#include <src/objects.h> /* objects */
#include <src/scanner.h> /* scanner */
#include <src/io.h> /* for Pr */

#include <src/gaputils.h>

Expand Down
Loading

0 comments on commit 7faf0fc

Please sign in to comment.