mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-29 14:40:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

add CompileEnv to lexer

Browse source
This commit is contained in:
Walter Bright 2023-03-05 00:25:56 -08:00 • committed by The Dlang Bot
parent 77b933e7e0
commit a986508ed0
20 changed files with 172 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/src/dmd/cparse.d
View file

@ -71,9 +71,9 @@ final class CParser(AST) : Parser!AST
extern (D) this(TARGET)(AST.Module _module, const(char)[] input, bool doDocComment, extern (D) this(TARGET)(AST.Module _module, const(char)[] input, bool doDocComment,
ErrorSink errorSink, ErrorSink errorSink,
const ref TARGET target, OutBuffer* defines) scope const ref TARGET target, OutBuffer* defines, const CompileEnv* compileEnv) scope
{ {
super(_module, input, doDocComment, errorSink); super(_module, input, doDocComment, errorSink, compileEnv);
//printf("CParser.this()\n"); //printf("CParser.this()\n");
mod = _module; mod = _module;

4
compiler/src/dmd/dmodule.d
View file

@ -767,7 +767,7 @@ extern (C++) final class Module : Package
{ {
filetype = FileType.c; filetype = FileType.c;
scope p = new CParser!AST(this, buf, cast(bool) docfile, global.errorSink, target.c, &defines); scope p = new CParser!AST(this, buf, cast(bool) docfile, global.errorSink, target.c, &defines, &global.compileEnv);
p.nextToken(); p.nextToken();
checkCompiledImport(); checkCompiledImport();
members = p.parseModule(); members = p.parseModule();
@ -776,7 +776,7 @@ extern (C++) final class Module : Package
} }
else else
{ {
scope p = new Parser!AST(this, buf, cast(bool) docfile, global.errorSink); scope p = new Parser!AST(this, buf, cast(bool) docfile, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
p.parseModuleDeclaration(); p.parseModuleDeclaration();
md = p.md; md = p.md;

2
compiler/src/dmd/doc.d
View file

@ -5184,7 +5184,7 @@ private void highlightCode2(Scope* sc, Dsymbols* a, ref OutBuffer buf, size_t of
scope Lexer lex = new Lexer(null, cast(char*)buf[].ptr, 0, buf.length - 1, 0, 1, scope Lexer lex = new Lexer(null, cast(char*)buf[].ptr, 0, buf.length - 1, 0, 1,
global.errorSink, global.errorSink,
global.vendor, global.versionNumber()); &global.compileEnv);
OutBuffer res; OutBuffer res;
const(char)* lastp = cast(char*)buf[].ptr; const(char)* lastp = cast(char*)buf[].ptr;
//printf("highlightCode2('%.*s')\n", cast(int)(buf.length - 1), buf[].ptr); //printf("highlightCode2('%.*s')\n", cast(int)(buf.length - 1), buf[].ptr);

2
compiler/src/dmd/dsymbolsem.d
View file

@ -1933,7 +1933,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
const len = buf.length; const len = buf.length;
buf.writeByte(0); buf.writeByte(0);
const str = buf.extractSlice()[0 .. len]; const str = buf.extractSlice()[0 .. len];
scope p = new Parser!ASTCodegen(cd.loc, sc._module, str, false, global.errorSink); scope p = new Parser!ASTCodegen(cd.loc, sc._module, str, false, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
auto d = p.parseDeclDefs(0); auto d = p.parseDeclDefs(0);

4
compiler/src/dmd/dtoh.d
View file

@ -84,9 +84,9 @@ extern(C++) void genCppHdrFiles(ref Modules ms)
m.accept(v); m.accept(v);
if (global.params.cxxhdr.fullOutput) if (global.params.cxxhdr.fullOutput)
buf.printf("// Automatically generated by %s Compiler v%d", global.vendor.ptr, global.versionNumber()); buf.printf("// Automatically generated by %s Compiler v%d", global.compileEnv.vendor.ptr, global.versionNumber());
else else
buf.printf("// Automatically generated by %s Compiler", global.vendor.ptr); buf.printf("// Automatically generated by %s Compiler", global.compileEnv.vendor.ptr);
buf.writenl(); buf.writenl();
buf.writenl(); buf.writenl();

2
compiler/src/dmd/errors.d
View file

@ -823,7 +823,7 @@ private void colorHighlightCode(ref OutBuffer buf)
if (!errorSinkNull) if (!errorSinkNull)
errorSinkNull = new ErrorSinkNull; errorSinkNull = new ErrorSinkNull;
scope Lexer lex = new Lexer(null, cast(char*)buf[].ptr, 0, buf.length - 1, 0, 1, errorSinkNull, global.vendor, global.versionNumber()); scope Lexer lex = new Lexer(null, cast(char*)buf[].ptr, 0, buf.length - 1, 0, 1, errorSinkNull, &global.compileEnv);
OutBuffer res; OutBuffer res;
const(char)* lastp = cast(char*)buf[].ptr; const(char)* lastp = cast(char*)buf[].ptr;
//printf("colorHighlightCode('%.*s')\n", cast(int)(buf.length - 1), buf[].ptr); //printf("colorHighlightCode('%.*s')\n", cast(int)(buf.length - 1), buf[].ptr);

2
compiler/src/dmd/expressionsem.d
View file

@ -6106,7 +6106,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
uint errors = global.errors; uint errors = global.errors;
const len = buf.length; const len = buf.length;
const str = buf.extractChars()[0 .. len]; const str = buf.extractChars()[0 .. len];
scope p = new Parser!ASTCodegen(exp.loc, sc._module, str, false, global.errorSink); scope p = new Parser!ASTCodegen(exp.loc, sc._module, str, false, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
//printf("p.loc.linnum = %d\n", p.loc.linnum); //printf("p.loc.linnum = %d\n", p.loc.linnum);

32
compiler/src/dmd/frontend.h
View file

@ -3363,6 +3363,30 @@ struct Param final
{} {}
}; };
struct CompileEnv final
{
uint32_t versionNumber;
_d_dynamicArray< const char > date;
_d_dynamicArray< const char > time;
_d_dynamicArray< const char > vendor;
_d_dynamicArray< const char > timestamp;
CompileEnv() :
versionNumber(),
date(),
time(),
vendor(),
timestamp()
{
}
CompileEnv(uint32_t versionNumber, _d_dynamicArray< const char > date = {}, _d_dynamicArray< const char > time = {}, _d_dynamicArray< const char > vendor = {}, _d_dynamicArray< const char > timestamp = {}) :
versionNumber(versionNumber),
date(date),
time(time),
vendor(vendor),
timestamp(timestamp)
{}
};
struct Global final struct Global final
{ {
_d_dynamicArray< const char > inifilename; _d_dynamicArray< const char > inifilename;
@ -3370,7 +3394,7 @@ struct Global final
_d_dynamicArray< const char > written; _d_dynamicArray< const char > written;
Array<const char* >* path; Array<const char* >* path;
Array<const char* >* filePath; Array<const char* >* filePath;
_d_dynamicArray< const char > vendor; CompileEnv compileEnv;
Param params; Param params;
uint32_t errors; uint32_t errors;
uint32_t warnings; uint32_t warnings;
@ -3399,7 +3423,7 @@ struct Global final
written(24, "written by Walter Bright"), written(24, "written by Walter Bright"),
path(), path(),
filePath(), filePath(),
vendor(), compileEnv(),
params(), params(),
errors(), errors(),
warnings(), warnings(),
@ -3416,13 +3440,13 @@ struct Global final
preprocess() preprocess()
{ {
} }
Global(_d_dynamicArray< const char > inifilename, _d_dynamicArray< const char > copyright = { 73, "Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved" }, _d_dynamicArray< const char > written = { 24, "written by Walter Bright" }, Array<const char* >* path = nullptr, Array<const char* >* filePath = nullptr, _d_dynamicArray< const char > vendor = {}, Param params = Param(), uint32_t errors = 0u, uint32_t warnings = 0u, uint32_t gag = 0u, uint32_t gaggedErrors = 0u, uint32_t gaggedWarnings = 0u, void* console = nullptr, Array<Identifier* >* versionids = nullptr, Array<Identifier* >* debugids = nullptr, bool hasMainFunction = false, uint32_t varSequenceNumber = 1u, FileManager* fileManager = nullptr, ErrorSink* errorSink = nullptr, FileName(*preprocess)(FileName , const Loc& , bool& , OutBuffer* ) = nullptr) : Global(_d_dynamicArray< const char > inifilename, _d_dynamicArray< const char > copyright = { 73, "Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved" }, _d_dynamicArray< const char > written = { 24, "written by Walter Bright" }, Array<const char* >* path = nullptr, Array<const char* >* filePath = nullptr, CompileEnv compileEnv = CompileEnv(), Param params = Param(), uint32_t errors = 0u, uint32_t warnings = 0u, uint32_t gag = 0u, uint32_t gaggedErrors = 0u, uint32_t gaggedWarnings = 0u, void* console = nullptr, Array<Identifier* >* versionids = nullptr, Array<Identifier* >* debugids = nullptr, bool hasMainFunction = false, uint32_t varSequenceNumber = 1u, FileManager* fileManager = nullptr, ErrorSink* errorSink = nullptr, FileName(*preprocess)(FileName , const Loc& , bool& , OutBuffer* ) = nullptr) :
inifilename(inifilename), inifilename(inifilename),
copyright(copyright), copyright(copyright),
written(written), written(written),
path(path), path(path),
filePath(filePath), filePath(filePath),
vendor(vendor), compileEnv(compileEnv),
params(params), params(params),
errors(errors), errors(errors),
warnings(warnings), warnings(warnings),

47
compiler/src/dmd/globals.d
View file

@ -11,7 +11,10 @@
module dmd.globals; module dmd.globals;
import core.stdc.stdio;
import core.stdc.stdint; import core.stdc.stdint;
import core.stdc.string;
import dmd.root.array; import dmd.root.array;
import dmd.root.filename; import dmd.root.filename;
import dmd.common.outbuffer; import dmd.common.outbuffer;
@ -20,6 +23,8 @@ import dmd.errors;
import dmd.file_manager; import dmd.file_manager;
import dmd.identifier; import dmd.identifier;
import dmd.location; import dmd.location;
import dmd.lexer : CompileEnv;
import dmd.utils;
/// Defines a setting for how compiler warnings and deprecations are handled /// Defines a setting for how compiler warnings and deprecations are handled
enum DiagnosticReporting : ubyte enum DiagnosticReporting : ubyte
@ -270,9 +275,7 @@ extern (C++) struct Global
Array!(const(char)*)* filePath; /// Array of char*'s which form the file import lookup path Array!(const(char)*)* filePath; /// Array of char*'s which form the file import lookup path
private enum string _version = import("VERSION"); private enum string _version = import("VERSION");
private enum uint _versionNumber = parseVersionNumber(_version); CompileEnv compileEnv;
const(char)[] vendor; /// Compiler backend name
Param params; /// command line parameters Param params; /// command line parameters
uint errors; /// number of errors reported so far uint errors; /// number of errors reported so far
@ -350,12 +353,12 @@ extern (C++) struct Global
extern (C++) void _init() extern (C++) void _init()
{ {
global.errorSink = new ErrorSinkCompiler; errorSink = new ErrorSinkCompiler;
this.fileManager = new FileManager(); this.fileManager = new FileManager();
version (MARS) version (MARS)
{ {
vendor = "Digital Mars D"; compileEnv.vendor = "Digital Mars D";
// -color=auto is the default value // -color=auto is the default value
import dmd.console : detectTerminal; import dmd.console : detectTerminal;
@ -363,8 +366,38 @@ extern (C++) struct Global
} }
else version (IN_GCC) else version (IN_GCC)
{ {
vendor = "GNU D"; compileEnv.vendor = "GNU D";
} }
compileEnv.versionNumber = parseVersionNumber(_version);
/* Initialize date, time, and timestamp
*/
import core.stdc.time;
import core.stdc.stdlib : getenv;
time_t ct;
// https://issues.dlang.org/show_bug.cgi?id=20444
if (auto p = getenv("SOURCE_DATE_EPOCH"))
{
if (!ct.parseDigits(p[0 .. strlen(p)]))
errorSink.error(Loc.initial, "value of environment variable `SOURCE_DATE_EPOCH` should be a valid UNIX timestamp, not: `%s`", p);
}
else
core.stdc.time.time(&ct);
const p = ctime(&ct);
assert(p);
__gshared char[11 + 1] date = 0; // put in BSS segment
__gshared char[8 + 1] time = 0;
__gshared char[24 + 1] timestamp = 0;
const dsz = snprintf(&date[0], date.length, "%.6s %.4s", p + 4, p + 20);
const tsz = snprintf(&time[0], time.length, "%.8s", p + 11);
const tssz = snprintf(&timestamp[0], timestamp.length, "%.24s", p);
assert(dsz > 0 && tsz > 0 && tssz > 0);
compileEnv.time = time[0 .. tsz];
compileEnv.date = date[0 .. dsz];
compileEnv.timestamp = timestamp[0 .. tssz];
} }
/** /**
@ -415,7 +448,7 @@ extern (C++) struct Global
*/ */
extern(C++) uint versionNumber() extern(C++) uint versionNumber()
{ {
return _versionNumber; return compileEnv.versionNumber;
} }
/** /**

11
compiler/src/dmd/globals.h
View file

@ -252,6 +252,15 @@ const DString hdr_ext = "di"; // for D 'header' import files
const DString json_ext = "json"; // for JSON files const DString json_ext = "json"; // for JSON files
const DString map_ext = "map"; // for .map files const DString map_ext = "map"; // for .map files
struct CompileEnv
{
uint32_t versionNumber;
DString date;
DString time;
DString vendor;
DString timestamp;
};
struct Global struct Global
{ {
DString inifilename; DString inifilename;
@ -261,7 +270,7 @@ struct Global
Array<const char *> *path; // Array of char*'s which form the import lookup path Array<const char *> *path; // Array of char*'s which form the import lookup path
Array<const char *> *filePath; // Array of char*'s which form the file import lookup path Array<const char *> *filePath; // Array of char*'s which form the file import lookup path
DString vendor; // Compiler backend name CompileEnv compileEnv;
Param params; Param params;
unsigned errors; // number of errors reported so far unsigned errors; // number of errors reported so far

6
compiler/src/dmd/iasmgcc.d
View file

@ -302,7 +302,7 @@ Ldone:
extern (C++) public Statement gccAsmSemantic(GccAsmStatement s, Scope *sc) extern (C++) public Statement gccAsmSemantic(GccAsmStatement s, Scope *sc)
{ {
//printf("GccAsmStatement.semantic()\n"); //printf("GccAsmStatement.semantic()\n");
scope p = new Parser!ASTCodegen(sc._module, ";", false, global.errorSink); scope p = new Parser!ASTCodegen(sc._module, ";", false, global.errorSink, &global.compileEnv);
// Make a safe copy of the token list before parsing. // Make a safe copy of the token list before parsing.
Token *toklist = null; Token *toklist = null;
@ -410,7 +410,7 @@ unittest
{ {
const errors = global.errors; const errors = global.errors;
scope gas = new GccAsmStatement(Loc.initial, tokens); scope gas = new GccAsmStatement(Loc.initial, tokens);
scope p = new Parser!ASTCodegen(null, ";", false, global.errorSink); scope p = new Parser!ASTCodegen(null, ";", false, global.errorSink, &global.compileEnv);
p.token = *tokens; p.token = *tokens;
p.parseGccAsm(gas); p.parseGccAsm(gas);
return global.errors - errors; return global.errors - errors;
@ -420,7 +420,7 @@ unittest
static void parseAsm(string input, bool expectError) static void parseAsm(string input, bool expectError)
{ {
// Generate tokens from input test. // Generate tokens from input test.
scope p = new Parser!ASTCodegen(null, input, false, global.errorSink); scope p = new Parser!ASTCodegen(null, input, false, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
Token* toklist = null; Token* toklist = null;

10
compiler/src/dmd/json.d
View file

@ -833,7 +833,7 @@ public:
{ {
import dmd.target : target; import dmd.target : target;
objectStart(); objectStart();
requiredProperty("vendor", global.vendor); requiredProperty("vendor", global.compileEnv.vendor);
requiredProperty("version", global.versionString()); requiredProperty("version", global.versionString());
property("__VERSION__", global.versionNumber()); property("__VERSION__", global.versionNumber());
requiredProperty("interface", determineCompilerInterface()); requiredProperty("interface", determineCompilerInterface());
@ -1070,13 +1070,13 @@ Determines and returns the compiler interface which is one of `dmd`, `ldc`,
*/ */
private extern(D) string determineCompilerInterface() private extern(D) string determineCompilerInterface()
{ {
if (global.vendor == "Digital Mars D") if (global.compileEnv.vendor == "Digital Mars D")
return "dmd"; return "dmd";
if (global.vendor == "LDC") if (global.compileEnv.vendor == "LDC")
return "ldc"; return "ldc";
if (global.vendor == "GNU D") if (global.compileEnv.vendor == "GNU D")
return "gdc"; return "gdc";
if (global.vendor == "SDC") if (global.compileEnv.vendor == "SDC")
return "sdc"; return "sdc";
return null; return null;
} }

119
compiler/src/dmd/lexer.d
View file

@ -14,12 +14,8 @@
module dmd.lexer; module dmd.lexer;
import core.stdc.ctype; import core.stdc.ctype;
import core.stdc.errno;
import core.stdc.stdarg;
import core.stdc.stdio; import core.stdc.stdio;
import core.stdc.stdlib : getenv;
import core.stdc.string; import core.stdc.string;
import core.stdc.time;
import dmd.entity; import dmd.entity;
import dmd.errorsink; import dmd.errorsink;
@ -31,10 +27,8 @@ import dmd.root.ctfloat;
import dmd.common.outbuffer; import dmd.common.outbuffer;
import dmd.root.port; import dmd.root.port;
import dmd.root.rmem; import dmd.root.rmem;
import dmd.root.string;
import dmd.root.utf; import dmd.root.utf;
import dmd.tokens; import dmd.tokens;
import dmd.utils;
nothrow: nothrow:
@ -43,6 +37,18 @@ version (DMDLIB)
version = LocOffset; version = LocOffset;
} }
/***********************************************************
* Values to use for various magic identifiers
*/
struct CompileEnv
{
uint versionNumber; /// __VERSION__
const(char)[] date; /// __DATE__
const(char)[] time; /// __TIME__
const(char)[] vendor; /// __VENDOR__
const(char)[] timestamp; /// __TIMESTAMP__
}
/*********************************************************** /***********************************************************
*/ */
class Lexer class Lexer
@ -87,8 +93,8 @@ class Lexer
int lastDocLine; // last line of previous doc comment int lastDocLine; // last line of previous doc comment
Token* tokenFreelist; Token* tokenFreelist;
uint versionNumber;
const(char)[] vendor; CompileEnv compileEnv; // environment
} }
nothrow: nothrow:
@ -105,13 +111,12 @@ class Lexer
* doDocComment = handle documentation comments * doDocComment = handle documentation comments
* commentToken = comments become TOK.comment's * commentToken = comments become TOK.comment's
* errorSink = where error messages go, must not be null * errorSink = where error messages go, must not be null
* vendor = name of the vendor * compileEnv = version, vendor, date, time, etc.
* versionNumber = version of the caller
*/ */
this(const(char)* filename, const(char)* base, size_t begoffset, this(const(char)* filename, const(char)* base, size_t begoffset,
size_t endoffset, bool doDocComment, bool commentToken, size_t endoffset, bool doDocComment, bool commentToken,
ErrorSink errorSink, ErrorSink errorSink,
const(char)[] vendor = "DLF", uint versionNumber = 1) pure scope const CompileEnv* compileEnv) pure scope
{ {
scanloc = Loc(filename, 1, 1); scanloc = Loc(filename, 1, 1);
// debug printf("Lexer::Lexer(%p)\n", base); // debug printf("Lexer::Lexer(%p)\n", base);
@ -128,8 +133,13 @@ class Lexer
this.lastDocLine = 0; this.lastDocLine = 0;
this.eSink = errorSink; this.eSink = errorSink;
assert(errorSink); assert(errorSink);
this.versionNumber = versionNumber; if (compileEnv)
this.vendor = vendor; this.compileEnv = *compileEnv;
else
{
this.compileEnv.versionNumber = 1;
this.compileEnv.vendor = "DLF";
}
//initKeywords(); //initKeywords();
/* If first line starts with '#!', ignore the line /* If first line starts with '#!', ignore the line
*/ */
@ -169,10 +179,10 @@ class Lexer
*/ */
this(const(char)* filename, const(char)* base, size_t begoffset, size_t endoffset, this(const(char)* filename, const(char)* base, size_t begoffset, size_t endoffset,
bool doDocComment, bool commentToken, bool whitespaceToken, bool doDocComment, bool commentToken, bool whitespaceToken,
ErrorSink errorSink ErrorSink errorSink, const CompileEnv* compileEnv = null
) )
{ {
this(filename, base, begoffset, endoffset, doDocComment, commentToken, errorSink); this(filename, base, begoffset, endoffset, doDocComment, commentToken, errorSink, compileEnv);
this.whitespaceToken = whitespaceToken; this.whitespaceToken = whitespaceToken;
} }
@ -571,36 +581,26 @@ class Lexer
else if (*t.ptr == '_') // if special identifier token else if (*t.ptr == '_') // if special identifier token
{ {
// Lazy initialization void toToken(const(char)[] s)
TimeStampInfo.initialize(t.loc, eSink); {
t.value = TOK.string_;
t.ustring = s.ptr;
t.len = cast(uint)s.length;
t.postfix = 0;
}
if (id == Id.DATE) if (id == Id.DATE)
{ toToken(compileEnv.date);
t.ustring = TimeStampInfo.date.ptr;
goto Lstr;
}
else if (id == Id.TIME) else if (id == Id.TIME)
{ toToken(compileEnv.time);
t.ustring = TimeStampInfo.time.ptr;
goto Lstr;
}
else if (id == Id.VENDOR) else if (id == Id.VENDOR)
{ toToken(compileEnv.vendor);
t.ustring = vendor.xarraydup.ptr;
goto Lstr;
}
else if (id == Id.TIMESTAMP) else if (id == Id.TIMESTAMP)
{ toToken(compileEnv.timestamp);
t.ustring = TimeStampInfo.timestamp.ptr;
Lstr:
t.value = TOK.string_;
t.postfix = 0;
t.len = cast(uint)strlen(t.ustring);
}
else if (id == Id.VERSIONX) else if (id == Id.VERSIONX)
{ {
t.value = TOK.int64Literal; t.value = TOK.int64Literal;
t.unsvalue = versionNumber; t.unsvalue = compileEnv.versionNumber;
} }
else if (id == Id.EOFX) else if (id == Id.EOFX)
{ {
@ -3019,7 +3019,10 @@ class Lexer
auto dc = (lineComment && anyToken) ? &t.lineComment : &t.blockComment; auto dc = (lineComment && anyToken) ? &t.lineComment : &t.blockComment;
// Combine with previous doc comment, if any // Combine with previous doc comment, if any
if (*dc) if (*dc)
*dc = combineComments(*dc, buf[], newParagraph).toDString(); {
auto p = combineComments(*dc, buf[], newParagraph);
*dc = p ? p[0 .. strlen(p)] : null;
}
else else
*dc = buf.extractSlice(true); *dc = buf.extractSlice(true);
} }
@ -3067,42 +3070,6 @@ class Lexer
private: private:
/// Support for `__DATE__`, `__TIME__`, and `__TIMESTAMP__`
private struct TimeStampInfo
{
private __gshared bool initdone = false;
// Note: Those properties need to be guarded by a call to `init`
// The API isn't safe, and quite brittle, but it was left this way
// over performance concerns.
// This is currently only called once, from the lexer.
__gshared char[11 + 1] date;
__gshared char[8 + 1] time;
__gshared char[24 + 1] timestamp;
public static void initialize(const ref Loc loc, ErrorSink eSink) nothrow
{
if (initdone)
return;
initdone = true;
time_t ct;
// https://issues.dlang.org/show_bug.cgi?id=20444
if (auto p = getenv("SOURCE_DATE_EPOCH"))
{
if (!ct.parseDigits(p.toDString()))
eSink.error(loc, "value of environment variable `SOURCE_DATE_EPOCH` should be a valid UNIX timestamp, not: `%s`", p);
}
else
.time(&ct);
const p = ctime(&ct);
assert(p);
snprintf(&date[0], date.length, "%.6s %.4s", p + 4, p + 20);
snprintf(&time[0], time.length, "%.8s", p + 11);
snprintf(&timestamp[0], timestamp.length, "%.24s", p);
}
}
private enum LS = 0x2028; // UTF line separator private enum LS = 0x2028; // UTF line separator
private enum PS = 0x2029; // UTF paragraph separator private enum PS = 0x2029; // UTF paragraph separator
@ -3352,7 +3319,7 @@ unittest
*/ */
string text = "int"; // We rely on the implicit null-terminator string text = "int"; // We rely on the implicit null-terminator
ErrorSink errorSink = new ErrorSinkStderr; ErrorSink errorSink = new ErrorSinkStderr;
scope Lexer lex1 = new Lexer(null, text.ptr, 0, text.length, false, false, errorSink); scope Lexer lex1 = new Lexer(null, text.ptr, 0, text.length, false, false, errorSink, null);
TOK tok; TOK tok;
tok = lex1.nextToken(); tok = lex1.nextToken();
//printf("tok == %s, %d, %d\n", Token::toChars(tok), tok, TOK.int32); //printf("tok == %s, %d, %d\n", Token::toChars(tok), tok, TOK.int32);
@ -3388,7 +3355,7 @@ unittest
foreach (testcase; testcases) foreach (testcase; testcases)
{ {
scope Lexer lex2 = new Lexer(null, testcase.ptr, 0, testcase.length-1, false, false, errorSink); scope Lexer lex2 = new Lexer(null, testcase.ptr, 0, testcase.length-1, false, false, errorSink, null);
TOK tok = lex2.nextToken(); TOK tok = lex2.nextToken();
size_t iterations = 1; size_t iterations = 1;
while ((tok != TOK.endOfFile) && (iterations++ < testcase.length)) while ((tok != TOK.endOfFile) && (iterations++ < testcase.length))

11
compiler/src/dmd/parse.d
View file

@ -30,6 +30,8 @@ import dmd.root.rootobject;
import dmd.root.string; import dmd.root.string;
import dmd.tokens; import dmd.tokens;
alias CompileEnv = dmd.lexer.CompileEnv;
/*********************************************************** /***********************************************************
*/ */
class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
@ -53,11 +55,11 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
* loc location in source file of mixin * loc location in source file of mixin
*/ */
extern (D) this(const ref Loc loc, AST.Module _module, const(char)[] input, bool doDocComment, extern (D) this(const ref Loc loc, AST.Module _module, const(char)[] input, bool doDocComment,
ErrorSink errorSink) scope ErrorSink errorSink, const CompileEnv* compileEnv) scope
{ {
super(_module ? _module.srcfile.toChars() : null, input.ptr, 0, input.length, doDocComment, false, super(_module ? _module.srcfile.toChars() : null, input.ptr, 0, input.length, doDocComment, false,
errorSink, errorSink,
global.vendor, global.versionNumber()); compileEnv);
//printf("Parser::Parser()\n"); //printf("Parser::Parser()\n");
scanloc = loc; scanloc = loc;
@ -78,11 +80,12 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
//nextToken(); // start up the scanner //nextToken(); // start up the scanner
} }
extern (D) this(AST.Module _module, const(char)[] input, bool doDocComment, ErrorSink errorSink) scope extern (D) this(AST.Module _module, const(char)[] input, bool doDocComment, ErrorSink errorSink,
const CompileEnv* compileEnv) scope
{ {
super(_module ? _module.srcfile.toChars() : null, input.ptr, 0, input.length, doDocComment, false, super(_module ? _module.srcfile.toChars() : null, input.ptr, 0, input.length, doDocComment, false,
errorSink, errorSink,
global.vendor, global.versionNumber()); compileEnv);
//printf("Parser::Parser()\n"); //printf("Parser::Parser()\n");
mod = _module; mod = _module;

2
compiler/src/dmd/statementsem.d
View file

@ -4751,7 +4751,7 @@ private Statements* flatten(Statement statement, Scope* sc)
const len = buf.length; const len = buf.length;
buf.writeByte(0); buf.writeByte(0);
const str = buf.extractSlice()[0 .. len]; const str = buf.extractSlice()[0 .. len];
scope p = new Parser!ASTCodegen(cs.loc, sc._module, str, false, global.errorSink); scope p = new Parser!ASTCodegen(cs.loc, sc._module, str, false, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
auto a = new Statements(); auto a = new Statements();

2
compiler/src/dmd/typesem.d
View file

@ -4918,7 +4918,7 @@ RootObject compileTypeMixin(TypeMixin tm, Loc loc, Scope* sc)
const len = buf.length; const len = buf.length;
buf.writeByte(0); buf.writeByte(0);
const str = buf.extractSlice()[0 .. len]; const str = buf.extractSlice()[0 .. len];
scope p = new Parser!ASTCodegen(loc, sc._module, str, false, global.errorSink); scope p = new Parser!ASTCodegen(loc, sc._module, str, false, global.errorSink, &global.compileEnv);
p.nextToken(); p.nextToken();
//printf("p.loc.linnum = %d\n", p.loc.linnum); //printf("p.loc.linnum = %d\n", p.loc.linnum);

2
compiler/src/tests/cxxfrontend.cc
View file

@ -68,7 +68,7 @@ static void frontend_init()
gc_disable(); gc_disable();
global._init(); global._init();
global.vendor = "Front-End Tester"; global.compileEnv.vendor = "Front-End Tester";
global.params.objname = NULL; global.params.objname = NULL;
target.os = Target::OS_linux; target.os = Target::OS_linux;

2
compiler/test/unit/lexer/diagnostic_reporter.d
View file

@ -64,7 +64,7 @@ private void lexUntilEndOfFile(string code)
if (!global.errorSink) if (!global.errorSink)
global.errorSink = new ErrorSinkCompiler; global.errorSink = new ErrorSinkCompiler;
scope lexer = new Lexer("test", code.ptr, 0, code.length, 0, 0, global.errorSink); scope lexer = new Lexer("test", code.ptr, 0, code.length, 0, 0, global.errorSink, null);
lexer.nextToken; lexer.nextToken;
while (lexer.nextToken != TOK.endOfFile) {} while (lexer.nextToken != TOK.endOfFile) {}

8
compiler/test/unit/lexer/lexer_dmdlib.d
View file

@ -170,7 +170,7 @@ unittest
TOK.rightCurly, TOK.rightCurly,
]; ];
Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, false, new ErrorSinkStderr); Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, false, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
TOK[] result; TOK[] result;
@ -191,7 +191,7 @@ unittest
TOK.comment, TOK.comment,
]; ];
Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, true, new ErrorSinkStderr); Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, true, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
TOK[] result; TOK[] result;
@ -217,7 +217,7 @@ unittest
TOK.reserved, TOK.reserved,
]; ];
Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, false, new ErrorSinkStderr); Lexer lexer = new Lexer(null, code.ptr, 0, code.length, false, false, new ErrorSinkStderr, null);
TOK[] result; TOK[] result;
@ -266,7 +266,7 @@ unittest
foreach (codeNum, code; codes) foreach (codeNum, code; codes)
{ {
auto fileName = text("file", codeNum, '\0'); auto fileName = text("file", codeNum, '\0');
Lexer lexer = new Lexer(fileName.ptr, code.ptr, 0, code.length, false, false, new ErrorSinkCompiler); Lexer lexer = new Lexer(fileName.ptr, code.ptr, 0, code.length, false, false, new ErrorSinkCompiler, null);
// Generate the errors // Generate the errors
foreach(unused; lexer){} foreach(unused; lexer){}
} }

36
compiler/test/unit/lexer/location_offset.d
View file

@ -17,7 +17,7 @@ unittest
{ {
enum code = "token"; enum code = "token";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -29,7 +29,7 @@ unittest
{ {
enum code = "ignored_token token"; enum code = "ignored_token token";
scope lexer = new Lexer("test.d", code.ptr, 13, code.length - 14, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 13, code.length - 14, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -41,7 +41,7 @@ unittest
{ {
enum code = "token1 token2 3"; enum code = "token1 token2 3";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -55,7 +55,7 @@ unittest
{ {
enum code = "token"; enum code = "token";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -68,7 +68,7 @@ unittest
{ {
enum code = "/* comment */"; enum code = "/* comment */";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -81,7 +81,7 @@ unittest
{ {
enum code = "// comment"; enum code = "// comment";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -94,7 +94,7 @@ unittest
{ {
enum code = "/+ comment +/"; enum code = "/+ comment +/";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, true, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -107,7 +107,7 @@ unittest
{ {
enum code = "/* comment */ token"; enum code = "/* comment */ token";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -119,7 +119,7 @@ unittest
{ {
enum code = "// comment\ntoken"; enum code = "// comment\ntoken";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -131,7 +131,7 @@ unittest
{ {
enum code = "/+ comment +/ token"; enum code = "/+ comment +/ token";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -143,7 +143,7 @@ unittest
{ {
enum code = "line\ntoken"; enum code = "line\ntoken";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -156,7 +156,7 @@ unittest
{ {
enum code = "line\r\ntoken"; enum code = "line\r\ntoken";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -169,7 +169,7 @@ unittest
{ {
enum code = "line\rtoken"; enum code = "line\rtoken";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -182,7 +182,7 @@ unittest
{ {
enum code = "'🍺'"; enum code = "'🍺'";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -194,7 +194,7 @@ unittest
{ {
enum code = `"🍺🍺"`; enum code = `"🍺🍺"`;
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
@ -206,7 +206,7 @@ unittest
{ {
enum code = "'🍺' token"; enum code = "'🍺' token";
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -219,7 +219,7 @@ unittest
{ {
enum code = `"🍺🍺" token`; enum code = `"🍺🍺" token`;
scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", code.ptr, 0, code.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;
@ -558,7 +558,7 @@ static foreach (tok; __traits(allMembers, TOK))
{ {
const newCode = "first_token " ~ tests[tok].code; const newCode = "first_token " ~ tests[tok].code;
scope lexer = new Lexer("test.d", newCode.ptr, 0, newCode.length, 0, 0, new ErrorSinkStderr); scope lexer = new Lexer("test.d", newCode.ptr, 0, newCode.length, 0, 0, new ErrorSinkStderr, null);
lexer.nextToken; lexer.nextToken;
lexer.nextToken; lexer.nextToken;