Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Fixes $format Parsing #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes $format Parsing #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/odata.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ skip = "$skip=" a:INT {return {'$skip': ~~a }; }
/ "$skip=" .* { return {"error": 'invalid $skip parameter'}; }

//$format
format = "$format=" v:.+ { return {'$format': v.join('') }; }
format = "$format=" v:[^&]+ { return {'$format': v.join('') }; }
/ "$format=" .* { return {"error": 'invalid $format parameter'}; }
//$inlinecount
inlinecount = "$inlinecount=" v:("allpages" / "none") { return {'$inlinecount': v }; }
Expand Down Expand Up @@ -273,12 +273,12 @@ filter = "$filter=" list:filterExpr {
}
/ "$filter=" .* { return {"error": 'invalid $filter parameter'}; }

filterExpr =
filterExpr =
left:("(" WSP? filter:filterExpr WSP? ")"{return filter}) right:( WSP type:("and"/"or") WSP value:filterExpr{
return { type: type, value: value}
})? {
return filterExprHelper(left, right);
} /
} /
left:cond right:( WSP type:("and"/"or") WSP value:filterExpr{
return { type: type, value: value}
})? {
Expand Down
Loading