Changeset 9d43db94269512bf20ab23e9dd7416fe0c741151

Timestamp:

16/08/10 21:41:49 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

b36d53cc61ecdfd153a0c3f7029459580c56d6c4

Parents:

759935945aef4be4bdc69724a7648f25885843f4

git-committer:

Matias De la Puente <mfpuente.ar@…> (16/08/10 21:41:49)

Message:

Projects: Improve jump to error/warning line in build log

Files:

• data/sdcc.i4ucbuilder (modified) (4 diffs)
• libi4uc/i4ucbuildersourcetype.vala (modified) (3 diffs)
• libi4uc/i4ucprofilebuilder.vala (modified) (2 diffs)
• libi4uc/i4ucprojectspresenter.vala (modified) (1 diff)

data/sdcc.i4ucbuilder

@@ -15 +15 @@
 object_type=.o
 build_command=sdcc -c -mpic14 -p%device %source -o %object
-output_regex=(.+):([0-9]+):(.+)
-output_regex_line_index=1
+output_regex=(.+):(?<line>[0-9]+):(.+)
 clean_types=.o;.asm;.lst;
 
@@ -23 +22 @@
 object_type=.o
 build_command=gpasm -c -p%device %source -o %object
-output_regex=(.+):([0-9]+):(.+)
-output_regex_line_index=1
+output_regex=(.+):(?<line>[0-9]+):(.+)
 clean_types=.o;.lst;
 
@@ -38 +36 @@
 object_type=.o
 build_command=sdcc -c -mpic16 -p%device %source -o %object
-output_regex=(.+):([0-9]+):(.+)
-output_regex_line_index=1
+output_regex=(.+):(?<line>[0-9]+):(.+)
 clean_types=.o;.asm;.lst;
 
@@ -46 +43 @@
 object_type=.o
 build_command=gpasm -c -p%device %source -o %object
-output_regex=(.+):([0-9]+):(.+)
-output_regex_line_index=1
+output_regex=(.+):(?<line>[0-9]+):(.+)
 clean_types=.o;.lst;
 

libi4uc/i4ucbuildersourcetype.vala

@@ -29 +29 @@
         public string build_command { set; get; }
         public string output_regex { set; get; default=""; }
-        public int output_regex_line_index { set; get; default=-1; }
         public Gee.List<string> clean_types { get { return _clean_types; } }
         
@@ -39 +38 @@
                 if (key_file.has_key (group, "output_regex"))
                         _output_regex = key_file.get_string (group, "output_regex");
-                if (key_file.has_key (group, "output_regex_line_index"))
-                        _output_regex_line_index = key_file.get_integer (group, "output_regex_line_index");
                 foreach (var clean_type in key_file.get_string_list (group, "clean_types"))
                         _clean_types.add (clean_type);
@@ -51 +48 @@
                 key_file.set_string (group, "build_command", _build_command);
                 key_file.set_string (group, "output_regex", _output_regex);
-                key_file.set_integer (group, "output_regex_line_index", _output_regex_line_index);
                 key_file.set_string_list (group, "clean_types", _clean_types.to_array ());
         }

libi4uc/i4ucprofilebuilder.vala

@@ -26 +26 @@
         public string output;
         public string output_regex;
-        public int output_regex_line_index;
         public string source_uri;
 }
@@ -93 +92 @@
                                 command_context.command = command;
                                 command_context.output_regex = source_type.output_regex;
-                                command_context.output_regex_line_index = source_type.output_regex_line_index;
                                 command_context.source_uri = source_uri;
                                 

libi4uc/i4ucprojectspresenter.vala

@@ -288 +288 @@
         {
                 if (command_context.output_regex == null ||
-                    command_context.output_regex == "" ||
-                    !Regex.match_simple (command_context.output_regex, output) ||
-                    command_context.output_regex_line_index == -1)
-                        return;
-                
-                string[] sequence = {};
-                foreach (var str in Regex.split_simple (command_context.output_regex, output))
-                        if (str != "")
-                                sequence += str;
-                
-                var line = sequence[command_context.output_regex_line_index].to_int ();
-                _documents_presenter.open_document (command_context.source_uri, line);
+                    command_context.output_regex == "")
+                        return;
+                
+                try
+                {
+                        var regex = new Regex (command_context.output_regex);
+                        
+                        MatchInfo match_info;
+                        if (!regex.match (output, 0, out match_info))
+                                return;
+                        
+                        var line = match_info.fetch_named ("line");
+                        _documents_presenter.open_document (command_context.source_uri, line.to_int ());
+                }
+                catch (Error e)
+                {
+                        warning (e.message);
+                }
         }