Merge tree-sitter-fortran/master (to be finished)

Author: inaki-amatria

grammar.js

@@ -58,6 +58,8 @@ static bool is_exp_sentinel(char chr) {
         case 'd':
         case 'E':
         case 'e':
+        case 'Q':
+        case 'q':
             return true;
         default:
             return false;
@@ -113,6 +115,7 @@ static BoolOrErr scan_number(TSLexer *lexer) {
             advance(lexer);
             if (lexer->lookahead == '+' || lexer->lookahead == '-') {
                 advance(lexer);
+                lexer->mark_end(lexer);
             }
             switch (scan_int(lexer)) {
                 case False:
@@ -122,7 +125,6 @@ static BoolOrErr scan_number(TSLexer *lexer) {
                 case Error:
                     return Error;
             }
-            lexer->mark_end(lexer);
             lexer->result_symbol = FLOAT_LITERAL;
         }
     }
@@ -165,13 +167,13 @@ static bool skip_literal_continuation_sequence(TSLexer *lexer) {
         return true;
     }
 
-    skip(lexer);
+    advance(lexer);
     while (iswspace(lexer->lookahead)) {
-        skip(lexer);
+        advance(lexer);
     }
-    // second '&' required to continue the literal
+    // second '&' technically required to continue the literal
     if (lexer->lookahead == '&') {
-        skip(lexer);
+        advance(lexer);
         return true;
     }
     return false;
@@ -209,7 +211,7 @@ static bool scan_hollerith_constant(TSLexer *lexer) {
     advance(lexer);
 
     // Read exactly 'n' characters
-    for (int i = 0; i < length; i++) {
+    for (unsigned i = 0; i < length; i++) {
         if (!lexer->lookahead || lexer->eof(lexer)) {
             return false;
         }
@@ -377,6 +379,7 @@ static bool scan_string_literal(TSLexer *lexer) {
             // the end of the literal. We also need to check that an
             // escaped quote isn't split in half by a line
             // continuation -- people do this!
+            lexer->mark_end(lexer);
             skip_literal_continuation_sequence(lexer);
             if (lexer->lookahead != opening_quote) {
                 return true;