Mercurial > projects > dil
comparison src/main.d @ 814:49e32b5bc161
Added isValidUnreservedIdentifier() to Lexer.
Added the msg InvalidModuleName.
author | Aziz K?ksal <aziz.koeksal@gmail.com> |
---|---|
date | Wed, 12 Mar 2008 17:01:27 +0100 |
parents | 5c29f1ebec9f |
children | 35d238d502cb |
comparison
equal
deleted
inserted
replaced
813:1abffc396594 | 814:49e32b5bc161 |
---|---|
332 cc.addVersionId("dil"); | 332 cc.addVersionId("dil"); |
333 cc.addVersionId("all"); | 333 cc.addVersionId("all"); |
334 version(D2) | 334 version(D2) |
335 cc.addVersionId("D_Version2"); | 335 cc.addVersionId("D_Version2"); |
336 foreach (versionId; GlobalSettings.versionIds) | 336 foreach (versionId; GlobalSettings.versionIds) |
337 if (!Lexer.isReservedIdentifier(versionId)) | 337 if (Lexer.isValidUnreservedIdentifier(versionId)) |
338 cc.versionIds[versionId] = true; | 338 cc.versionIds[versionId] = true; |
339 return cc; | 339 return cc; |
340 } | 340 } |
341 | 341 |
342 bool parseDebugOrVersion(string arg, CompilationContext context) | 342 bool parseDebugOrVersion(string arg, CompilationContext context) |
346 if (arg.length > 7) | 346 if (arg.length > 7) |
347 { | 347 { |
348 auto val = arg[7..$]; | 348 auto val = arg[7..$]; |
349 if (isdigit(val[0])) | 349 if (isdigit(val[0])) |
350 context.debugLevel = Integer.toInt(val); | 350 context.debugLevel = Integer.toInt(val); |
351 else if (!Lexer.isReservedIdentifier(val)) | 351 else if (Lexer.isValidUnreservedIdentifier(val)) |
352 context.addDebugId(val); | 352 context.addDebugId(val); |
353 } | 353 } |
354 else | 354 else |
355 context.debugLevel = 1; | 355 context.debugLevel = 1; |
356 } | 356 } |
357 else if (arg.length > 9 && strbeg(arg, "-version=")) | 357 else if (arg.length > 9 && strbeg(arg, "-version=")) |
358 { | 358 { |
359 auto val = arg[9..$]; | 359 auto val = arg[9..$]; |
360 if (isdigit(val[0])) | 360 if (isdigit(val[0])) |
361 context.versionLevel = Integer.toInt(val); | 361 context.versionLevel = Integer.toInt(val); |
362 else if (!Lexer.isReservedIdentifier(val)) | 362 else if (Lexer.isValidUnreservedIdentifier(val)) |
363 context.addVersionId(val); | 363 context.addVersionId(val); |
364 } | 364 } |
365 else | 365 else |
366 return false; | 366 return false; |
367 return true; | 367 return true; |