Merge pull request #7 from codinuum/develop

Develop

Author: codinuum

src/ast/analyzing/common/edit_base.ml

@@ -1363,7 +1363,8 @@ class ['node_t, 'tree_t] seq_base options = object (self : 'edits)
                 let n2 = Info.get_node info2 in
                 n1#data#is_named_orig && n2#data#is_named_orig ||
                 (not n1#data#is_named && n2#data#is_named || n1#data#is_named && not n2#data#is_named) ||
-                n1#data#more_anonymized_label <> n2#data#more_anonymized_label
+                (not (n1#data#is_compatible_with n2#data) &&
+                 n1#data#more_anonymized_label <> n2#data#more_anonymized_label)
               in
               if ok then begin
                 let loc1 = Info.get_loc info1 in

src/ast/analyzing/langs/common/astloc.ml

@@ -227,7 +227,7 @@ let merge loc0 loc1 =
       loc
   end
 
-let collapse_forward
+let collapse_forward ?(len=1)
     { filename = fn0;
       start_offset = so0;
       end_offset   = eo0;
@@ -239,14 +239,14 @@ let collapse_forward
 =
     { filename = fn0;
       start_offset = so0;
-      end_offset   = so0;
+      end_offset   = so0+len-1;
       start_line   = sl0;
       start_char   = sc0;
       end_line     = sl0;
-      end_char     = sc0;
+      end_char     = sc0+len-1;
     }
 
-let collapse_backward
+let collapse_backward ?(len=1)
     { filename = fn0;
       start_offset = so0;
       end_offset   = eo0;
@@ -257,10 +257,10 @@ let collapse_backward
     }
 =
     { filename = fn0;
-      start_offset = eo0;
+      start_offset = eo0-len+1;
       end_offset   = eo0;
       start_line   = el0;
-      start_char   = ec0;
+      start_char   = ec0-len+1;
       end_line     = el0;
       end_char     = ec0;
     }

src/ast/analyzing/langs/common/astloc.mli

@@ -42,8 +42,8 @@ val start_to_string : ?show_ext:bool -> ?short:bool -> ?prefix:string -> ?suffix
 val end_to_string : ?show_ext:bool -> ?short:bool -> ?prefix:string -> ?suffix:string -> t -> string
 val normalize_fname : string -> string
 val merge : t -> t -> t
-val collapse_forward : t -> t
-val collapse_backward : t -> t
+val collapse_forward : ?len:int -> t -> t
+val collapse_backward : ?len:int -> t -> t
 val widen : t -> int -> t
 val is_contained : t -> t -> bool
 val to_offsets : t -> (int * int)

src/ast/analyzing/langs/fortran/parsing/src/tokenbuffer.ml

@@ -400,6 +400,7 @@ module F (Stat : Aux.STATE_T) = struct
    else
      raise Not_found
 
+ let toxxx_pat = Str.regexp "to\\([0-9]+\\)$"
 
  let hack_token (tokensrc : Tokensource.c) ((_tok, _loc) as _qtoken) =
     let loc = ref _loc in
@@ -1120,8 +1121,27 @@ module F (Stat : Aux.STATE_T) = struct
                           end
                           else begin (* not env#in_format_context *)
                             if is_head_of_stmt_ then begin
-                              DEBUG_MSG "<identifier> --> <pp-identifier>";
-                              tok := PP_IDENTIFIER s0
+                              if
+                                env#current_source#lang_config#is_fixed_source_form &&
+                                String.lowercase_ascii s0 = "go" &&
+                                Str.string_match toxxx_pat (String.lowercase_ascii s0') 0
+                              then begin
+                                DEBUG_MSG "GO TO<x> --> GO_TO <x>";
+                                let _, l0 = discard() in
+                                let l' = Loc.collapse_backward ~len:2 l0 in
+                                tokensrc#prepend (INT_LITERAL (Str.matched_group 1 s0'), l');
+                                let s_ =
+                                  s0^
+                                  (String.make (l0.Loc.start_offset-(!loc).Loc.end_offset-1) ' ')^
+                                  (String.sub s0' 0 2)
+                                in
+                                tok := GO_TO s_;
+                                loc := merge_locs !loc (Loc.collapse_forward ~len:2 l0)
+                              end
+                              else begin
+                                DEBUG_MSG "<identifier> --> <pp-identifier>";
+                                tok := PP_IDENTIFIER s0
+                              end
                             end
                             else begin
                               let is_kind_size =

src/ast/analyzing/langs/java/java_label.ml

@@ -2450,6 +2450,9 @@ let is_compatible lab1 lab2 =
   | Primary p1, Primary p2 -> Primary.is_compatible p1 p2
   | Method(n1, _), Method(n2, _) -> n1 = n2
   | Constructor(n1, _), Constructor(n2, _) -> n1 = n2
+  | ClassBody _, InterfaceBody _ | InterfaceBody _, ClassBody _ -> true
+  | ClassBody _, EnumBody _ | EnumBody _, ClassBody _ -> true
+  | EnumBody _, InterfaceBody _ | InterfaceBody _, EnumBody _ -> true
   | _ -> false
 
 let quasi_eq lab1 lab2 =
@@ -2611,6 +2614,7 @@ let is_named = function
   | ClassBody _
   | EnumBody _
   | Interface _
+  | Specifier _
   | AnnotationType _
   | AnnotationTypeBody _
   | InterfaceBody _
@@ -2646,7 +2650,8 @@ let is_named_orig = function
   | Class _
   | Enum _
   | EnumConstant _
-  | Interface _
+  | Interface _ 
+  | Specifier _
   | AnnotationType _
   | ElementDeclaration _
   | PackageDeclaration _

src/ast/analyzing/langs/java/parsing/src/ulexer.ml

@@ -315,9 +315,16 @@ module F (Stat : Parser_aux.STATE_T) = struct
 	raise EOF_reached
 
   |   _ ->
-      lexing_error lexbuf (Printf.sprintf "invalid symbol(%s)" (Ulexing.utf8_lexeme lexbuf))
-
+      let s = Ulexing.utf8_lexeme lexbuf in
+      if env#keep_going_flag then begin
+        let loc = offsets_to_loc (Ulexing.lexeme_start lexbuf) (Ulexing.lexeme_end lexbuf) in
+        Common.warning_loc loc "invalid symbol(%s)" s;
+        token lexbuf
+      end
+      else
+        lexing_error lexbuf (Printf.sprintf "invalid symbol(%s)" s)
 
+	
 
   and traditional_comment st = lexer
   |   "*/" -> env#comment_regions#add (env#current_pos_mgr#offsets_to_loc st (Ulexing.lexeme_end lexbuf))