d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Run through clang-format.

Browse source
This commit is contained in:
David Given 2017-01-07 22:56:00 +01:00
parent cca6171e55
commit d50a6f99de
1 changed files with 64 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lang/m2/comp/defmodule.c
View file

@ -9,26 +9,26 @@
/* $Id$ */ /* $Id$ */
#include "parameters.h"
#include "debug.h" #include "debug.h"
#include "parameters.h"
#include <stdlib.h> #include <alloc.h>
#include <assert.h> #include <assert.h>
#include <em_arith.h> #include <em_arith.h>
#include <em_label.h> #include <em_label.h>
#include <alloc.h> #include <stdlib.h>
#include "LLlex.h"
#include "Lpars.h"
#include "def.h"
#include "f_info.h"
#include "idf.h" #include "idf.h"
#include "input.h" #include "input.h"
#include "scope.h"
#include "LLlex.h"
#include "def.h"
#include "Lpars.h"
#include "f_info.h"
#include "main.h" #include "main.h"
#include "node.h"
#include "type.h"
#include "misc.h" #include "misc.h"
#include "node.h"
#include "scope.h"
#include "type.h"
#ifdef DEBUG #ifdef DEBUG
long sys_filesize(); long sys_filesize();
@ -37,18 +37,19 @@ long sys_filesize();
t_idf* DefId; t_idf* DefId;
char* char*
getwdir(fn) getwdir(fn) register char* fn;
register char *fn;
{ {
register char* p; register char* p;
char* strrchr(); char* strrchr();
while ((p = strrchr(fn,'/')) && *(p + 1) == '\0') { while ((p = strrchr(fn, '/')) && *(p + 1) == '\0')
{
/* remove trailing /'s */ /* remove trailing /'s */
*p = '\0'; *p = '\0';
} }
if (p) { if (p)
{
*p = '\0'; *p = '\0';
fn = Salloc(fn, (unsigned)(p - &fn[0] + 1)); fn = Salloc(fn, (unsigned)(p - &fn[0] + 1));
*p = '/'; *p = '/';
@ -58,8 +59,7 @@ getwdir(fn)
} }
STATIC STATIC
GetFile(name) GetFile(name) char* name;
char *name;
{ {
/* Try to find a file with basename "name" and extension ".def", /* Try to find a file with basename "name" and extension ".def",
in the directories mentioned in "DEFPATH". in the directories mentioned in "DEFPATH".
@ -71,7 +71,8 @@ GetFile(name)
buf[10] = '\0'; /* maximum length */ buf[10] = '\0'; /* maximum length */
strcat(buf, ".def"); strcat(buf, ".def");
DEFPATH[0] = WorkingDir; DEFPATH[0] = WorkingDir;
if (! InsertFile(buf, DEFPATH, &(FileName))) { if (!InsertFile(buf, DEFPATH, &(FileName)))
{
error("could not find a DEFINITION MODULE for \"%s\"", name); error("could not find a DEFINITION MODULE for \"%s\"", name);
return 0; return 0;
} }
@ -82,8 +83,7 @@ GetFile(name)
} }
t_def* t_def*
GetDefinitionModule(id, incr) GetDefinitionModule(id, incr) register t_idf* id;
register t_idf *id;
{ {
/* Return a pointer to the "def" structure of the definition /* Return a pointer to the "def" structure of the definition
module indicated by "id". module indicated by "id".
@ -99,7 +99,8 @@ GetDefinitionModule(id, incr)
level += incr; level += incr;
df = lookup(id, GlobalScope, D_IMPORTED, 0); df = lookup(id, GlobalScope, D_IMPORTED, 0);
if (!df) { if (!df)
{
/* Read definition module. Make an exception for SYSTEM. /* Read definition module. Make an exception for SYSTEM.
*/ */
extern int ForeignFlag; extern int ForeignFlag;
@ -110,18 +111,21 @@ GetDefinitionModule(id, incr)
newsc = CurrentScope; newsc = CurrentScope;
vis = CurrVis; vis = CurrVis;
newsc->sc_defmodule = incr; newsc->sc_defmodule = incr;
if (!strcmp(id->id_text, "SYSTEM")) { if (!strcmp(id->id_text, "SYSTEM"))
{
do_SYSTEM(); do_SYSTEM();
df = lookup(id, GlobalScope, D_IMPORTED, 0); df = lookup(id, GlobalScope, D_IMPORTED, 0);
} }
else { else
if (!is_anon_idf(id) && GetFile(id->id_text)) { {
if (!is_anon_idf(id) && GetFile(id->id_text))
{
char* f = FileName; char* f = FileName;
DefModule(); DefModule();
df = lookup(id, GlobalScope, D_IMPORTED, 0); df = lookup(id, GlobalScope, D_IMPORTED, 0);
if (level == 1 && if (level == 1 && (df && !(df->df_flags & D_FOREIGN)))
(df && !(df->df_flags & D_FOREIGN))) { {
/* The module is directly imported by /* The module is directly imported by
the currently defined module, and the currently defined module, and
is not foreign, so we have to is not foreign, so we have to
@ -134,29 +138,35 @@ GetDefinitionModule(id, incr)
n = dot2leaf(Def); n = dot2leaf(Def);
n->nd_def = newsc->sc_definedby; n->nd_def = newsc->sc_definedby;
if (nd_end) nd_end->nd_NEXT = n; if (nd_end)
else Modules = n; nd_end->nd_NEXT = n;
else
Modules = n;
nd_end = n; nd_end = n;
} }
free(f); free(f);
} }
else { else
{
df = lookup(id, GlobalScope, D_IMPORTED, 0); df = lookup(id, GlobalScope, D_IMPORTED, 0);
newsc->sc_name = id->id_text; newsc->sc_name = id->id_text;
} }
} }
close_scope(SC_CHKFORW); close_scope(SC_CHKFORW);
if (! df) { if (!df)
{
df = MkDef(id, GlobalScope, D_ERROR); df = MkDef(id, GlobalScope, D_ERROR);
df->mod_vis = vis; df->mod_vis = vis;
newsc->sc_definedby = df; newsc->sc_definedby = df;
} }
} }
else if (df->df_flags & D_BUSY) { else if (df->df_flags & D_BUSY)
{
error("definition module \"%s\" depends on itself", error("definition module \"%s\" depends on itself",
id->id_text); id->id_text);
} }
else if (df == Defined && level == 1) { else if (df == Defined && level == 1)
{
error("cannot import from current module \"%s\"", id->id_text); error("cannot import from current module \"%s\"", id->id_text);
df->df_kind = D_ERROR; df->df_kind = D_ERROR;
} }