Changeset 29 for trunk/NewView/CmdLineParameterUnit.pas

Timestamp:

Aug 19, 2006, 8:27:44 PM (19 years ago)

Author:

RBRi

Message:

more parser fixes and new unit tests

File:

• trunk/NewView/CmdLineParameterUnit.pas (modified) (4 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -325 +325 @@
      STATE_INSIDE_QUOTED = 3;
      STATE_INSIDE_QUOTED_START_QUOTE = 4;
+//     STATE_INSIDE_QUOTED_QUOTE_PROCESSED = 5;
   VAR
      i : Integer;
@@ -377 +378 @@
                  begin
                     tmpState := STATE_INSIDE_QUOTED;
-                    tmpCurrentCommand := tmpCurrentCommand + tmpCurrentChar;
-                 end;
+//                    tmpState := STATE_INSIDE_QUOTED_QUOTE_PROCESSED;
+                    tmpCurrentCommand := tmpCurrentCommand + tmpCurrentChar;
+                 end;
+//               STATE_INSIDE_QUOTED_QUOTE_PROCESSED :
+//                    tmpState := STATE_INSIDE_QUOTED_START_QUOTE;
                ELSE
                     tmpState := STATE_START_QUOTE;
@@ -410 +414 @@
                     tmpCurrentCommand := tmpCurrentCommand + tmpCurrentChar;
                  end;
+//               STATE_INSIDE_QUOTED_QUOTE_PROCESSED :
+//                 begin
+//                    tmpCurrentCommand := tmpCurrentCommand + tmpCurrentChar;
+//                 end;
                end;
             end;
@@ -421 +429 @@
           aResult.add(tmpCurrentCommand);
        end;
+     STATE_START_QUOTE :
+       begin
+          result := ERROR_UNMATCHED_QUOTE;
+       end;
      STATE_INSIDE_QUOTED_START_QUOTE :
        begin
-          aResult.add(tmpCurrentCommand);
+          if (0 < length(tmpCurrentCommand)) then
+          begin
+            aResult.add(tmpCurrentCommand);
+          end;
        end;
+     STATE_INSIDE_QUOTED :
+       begin
+          result := ERROR_UNMATCHED_QUOTE;
+          if (0 < length(tmpCurrentCommand)) then
+          begin
+            aResult.add(tmpCurrentCommand);
+          end;
+       end;
+//     STATE_INSIDE_QUOTED_QUOTE_PROCESSED :
+//       begin
+//          result := ERROR_UNMATCHED_QUOTE;
+//          if (1 < length(tmpCurrentCommand)) then
+//          begin
+//            aResult.add(copy(tmpCurrentCommand, 1, length(tmpCurrentCommand)-0));
+//          end
+//       end;
      ELSE
        begin
           result := ERROR_UNMATCHED_QUOTE;
-          aResult.add(tmpCurrentCommand);
+          if (0 < length(tmpCurrentCommand)) then
+          begin
+            aResult.add(tmpCurrentCommand);
+          end;
        end;
      end;