dlang · dlang-bot · Mar 8, 2022 · Mar 2, 2022 · Mar 3, 2022 · Mar 4, 2022
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.099.0-rc.1
+v2.099.0
diff --git a/changelog/22541.dd b/changelog/22541.dd
diff --git a/changelog/TraitsParameters.dd b/changelog/TraitsParameters.dd
diff --git a/changelog/__import.dd b/changelog/__import.dd
diff --git a/changelog/allow_casting_from_typetuple_to_typetuple.dd b/changelog/allow_casting_from_typetuple_to_typetuple.dd
diff --git a/changelog/disasm.dd b/changelog/disasm.dd
diff --git a/changelog/fix16997.dd b/changelog/fix16997.dd
diff --git a/changelog/fix18964.dd b/changelog/fix18964.dd
diff --git a/changelog/ignore_nonroot_ut.dd b/changelog/ignore_nonroot_ut.dd
diff --git a/changelog/main_return_type.dd b/changelog/main_return_type.dd
diff --git a/changelog/switch_fallthrough_error.dd b/changelog/switch_fallthrough_error.dd
diff --git a/changelog/throw_expression.dd b/changelog/throw_expression.dd
diff --git a/changelog/traits_initSymbol.dd b/changelog/traits_initSymbol.dd
diff --git a/src/dmd/dmodule.d b/src/dmd/dmodule.d
@@ -675,24 +675,28 @@ extern (C++) final class Module : Package
 
         //printf("Module::read('%s') file '%s'\n", toChars(), srcfile.toChars());
 
-        if (global.params.emitMakeDeps)
-        {
-            global.params.makeDeps.push(srcfile.toChars());
-        }
 
+
+        bool success;
         if (auto readResult = FileManager.fileManager.lookup(srcfile))
         {
             srcBuffer = readResult;
-            return true;
+            success = true;
         }
-
-        auto readResult = File.read(srcfile.toChars());
-        if (loadSourceBuffer(loc, readResult))
+        else
         {
-            FileManager.fileManager.add(srcfile, srcBuffer);
-            return true;
+            auto readResult = File.read(srcfile.toChars());
+            if (loadSourceBuffer(loc, readResult))
+            {
+                FileManager.fileManager.add(srcfile, srcBuffer);
+                success = true;
+            }
         }
-        return false;
+        if (success && global.params.emitMakeDeps)
+        {
+            global.params.makeDeps.push(srcfile.toChars());
+        }
+        return success;
     }
 
     /// syntactic parse

diff --git a/src/dmd/lexer.d b/src/dmd/lexer.d
@@ -374,14 +374,18 @@ class Lexer
                 goto case_ident;
 
             case 'r':
-                if (p[1] != '"')
+                if (Ccompile || p[1] != '"')
                     goto case_ident;
                 p++;
                 goto case '`';
             case '`':
+                if (Ccompile)
+                    goto default;
                 wysiwygStringConstant(t);
                 return;
             case 'q':
+                if (Ccompile)
+                    goto case_ident;
                 if (p[1] == '"')
                 {
                     p++;
@@ -659,6 +663,7 @@ class Lexer
                     endOfLine();
                     continue;
                 case '+':
+                    if (!Ccompile)
                     {
                         int nest;
                         startLoc = loc();
@@ -728,6 +733,7 @@ class Lexer
                         }
                         continue;
                     }
+                    break;
                 default:
                     break;
                 }
@@ -3293,5 +3299,3 @@ unittest
         assert(tok == TOK.endOfFile);
     }
 }
-
-