diff options
| -rw-r--r-- | parsing/lexer.mll | 8 | ||||
| -rw-r--r-- | stdlib/array.ml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/parsing/lexer.mll b/parsing/lexer.mll index 7a81f6782..d856efff4 100644 --- a/parsing/lexer.mll +++ b/parsing/lexer.mll @@ -135,7 +135,7 @@ let char_for_backslash = function let char_for_decimal_code lexbuf i = let c = 100 * (Char.code(Lexing.lexeme_char lexbuf i) - 48) + 10 * (Char.code(Lexing.lexeme_char lexbuf (i+1)) - 48) + - (Char.code(Lexing.lexeme_char lexbuf (i+2)) - 48) in + (Char.code(Lexing.lexeme_char lexbuf (i+2)) - 48) in if (c < 0 || c > 255) && not (in_comment ()) then raise (Error(Illegal_escape (Lexing.lexeme lexbuf), Location.curr lexbuf)) @@ -209,7 +209,7 @@ let newline = ('\010' | '\013' | "\013\010") let blank = [' ' '\009' '\012'] let lowercase = ['a'-'z' '\223'-'\246' '\248'-'\255' '_'] let uppercase = ['A'-'Z' '\192'-'\214' '\216'-'\222'] -let identchar = +let identchar = ['A'-'Z' 'a'-'z' '_' '\192'-'\214' '\216'-'\246' '\248'-'\255' '\'' '0'-'9'] let symbolchar = ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~'] @@ -224,7 +224,7 @@ let bin_literal = let int_literal = decimal_literal | hex_literal | oct_literal | bin_literal let float_literal = - ['0'-'9'] ['0'-'9' '_']* + ['0'-'9'] ['0'-'9' '_']* ('.' ['0'-'9' '_']* )? (['e' 'E'] ['+' '-']? ['0'-'9'] ['0'-'9' '_']*)? @@ -283,7 +283,7 @@ rule token = parse | int_literal "n" { let s = Lexing.lexeme lexbuf in try - NATIVEINT + NATIVEINT (Nativeint.of_string(String.sub s 0 (String.length s - 1))) with Failure _ -> raise (Error(Literal_overflow "nativeint", Location.curr lexbuf)) } diff --git a/stdlib/array.ml b/stdlib/array.ml index 0b021918f..4eb0cadf2 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -29,7 +29,7 @@ let init l f = for i = 1 to pred l do unsafe_set res i (f i) done; - res + res let make_matrix sx sy init = let res = create sx [||] in @@ -54,8 +54,8 @@ let append a1 a2 = let l1 = length a1 and l2 = length a2 in if l1 = 0 && l2 = 0 then [||] else begin let r = create (l1 + l2) (unsafe_get (if l1 > 0 then a1 else a2) 0) in - for i = 0 to l1 - 1 do unsafe_set r i (unsafe_get a1 i) done; - for i = 0 to l2 - 1 do unsafe_set r (i + l1) (unsafe_get a2 i) done; + for i = 0 to l1 - 1 do unsafe_set r i (unsafe_get a1 i) done; + for i = 0 to l2 - 1 do unsafe_set r (i + l1) (unsafe_get a2 i) done; r end @@ -67,7 +67,7 @@ let concat_aux init al = let res = create (size 0 al) init in let rec fill pos = function | [] -> () - | h::t -> + | h::t -> for i = 0 to length h - 1 do unsafe_set res (pos + i) (unsafe_get h i); done; |