@@ -71,6 +71,7 @@ sub _parse {

     my $pos;

     # Parse

+    my $original = $source;

     while (my $c = substr($source, 0, 1, '')) {

         # State is text

@@ -112,7 +113,7 @@ sub _parse {

                 # Unexpected

                 else {

                     croak qq/Parsing error. unexpected "}". / .

-                          qq/pos $pos of "$source"/;

+                          qq/pos $pos of "$original"/;

                 }

             }

@@ -121,7 +122,7 @@ sub _parse {

         }

         # State is tags

-        elsif ($state eq 'tag') {

+        else {

             # Tag start charactor

             if ($c eq '{') {

@@ -135,7 +136,7 @@ sub _parse {

                 # Unexpected

                 else {

                     croak qq/Parsing error. unexpected "{". / .

-                          qq/pos $pos of "$source"/;

+                          qq/pos $pos of "$original"/;

                 }

             }

@@ -176,7 +177,7 @@ sub _parse {

     }

     # Tag not finished

-    croak qq{Tag not finished. "$source"}

+    croak qq{Tag not finished. "$original"}

       if $state eq 'tag';

     # Add rest text

@@ -198,17 +199,11 @@ sub _build_query {

     # Build SQL 

     foreach my $node (@$tree) {

-        # Get type, tag name, and arguments

-        my $type = $node->{type};

-        

         # Text

-        if ($type eq 'text') {

-            # Join text

-            $sql .= $node->{value};

-        }

+        if ($node->{type} eq 'text') { $sql .= $node->{value} }

         # Tag

-        elsif ($type eq 'tag') {

+        else {

             # Tag name

             my $tag_name = $node->{tag_name};

@@ -16,6 +16,8 @@ my $datas;

 my $builder;

 my $query;

 my $ret_val;

+my $source;

+my $tree;

 test "Various source pattern";

 $datas = [

@@ -142,7 +144,24 @@ eval{$builder->build_query("{in a r}")};

 like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

      "$test : in : key not exist");

-test '_parse';

+test 'variouse source';

+$source = "a {= b} c \\{ \\} {= \\{} {= \\}} d;";

+$query = $builder->build_query($source);

+is($query->sql, 'a b = ? c { } { = ? } = ? d;', "$test : 1");

+$source = "abc;";

+$query = $builder->build_query($source);

+is($query->sql, 'abc;', "$test : 2");

+$source = "{= a}";

+$query = $builder->build_query($source);

+is($query->sql, 'a = ?;', "$test : 3");

+

+$source = "a {= b} }";

+eval{$builder->build_query($source)};

+like($@, qr/unexpected "}"/, "$test : error : 1");

+

+$source = "a {= {}";

+eval{$builder->build_query($source)};

+like($@, qr/unexpected "{"/, "$test : error : 2");