steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-04-19 20:40:18 -05:00
parent 4ce7ddb27d 17dd323941
commit 711d101154
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/shell/parser/parser.factor
View File

@ -39,6 +39,8 @@ TUPLE: factor-expr expr ;
: ast>variable-expr ( ast -- obj ) 2nd variable-expr boa ; : ast>variable-expr ( ast -- obj ) 2nd variable-expr boa ;
: ast>factor-expr ( ast -- obj ) 2nd >string factor-expr boa ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
EBNF: expr EBNF: expr
@ -59,6 +61,8 @@ single-quoted = sq (!(sq) .)* sq => [[ ast>single-quoted-expr ]]
double-quoted = dq (!(dq) .)* dq => [[ ast>double-quoted-expr ]] double-quoted = dq (!(dq) .)* dq => [[ ast>double-quoted-expr ]]
back-quoted = bq (!(bq) .)* bq => [[ ast>back-quoted-expr ]] back-quoted = bq (!(bq) .)* bq => [[ ast>back-quoted-expr ]]
factor = "$(" (!(")") .)* ")" => [[ ast>factor-expr ]]
variable = "$" other => [[ ast>variable-expr ]] variable = "$" other => [[ ast>variable-expr ]]
glob-char = ("*" | "?") glob-char = ("*" | "?")
@ -73,7 +77,7 @@ glob = glob-beginning-string glob-char (glob-rest-string | glob-char)* => [[ ast
other = (!(white | "&" | ">" | ">>" | "<" | "|") .)+ => [[ >string ]] other = (!(white | "&" | ">" | ">>" | "<" | "|") .)+ => [[ >string ]]
element = (single-quoted | double-quoted | back-quoted | variable | glob | other) element = (single-quoted | double-quoted | back-quoted | factor | variable | glob | other)
command = (element _)+ command = (element _)+
@ -88,4 +92,3 @@ pipeline = _ command _ (in-file)? _ "|" _ (command _ "|" _)* command _ (to-file
submission = (pipeline | basic) submission = (pipeline | basic)
;EBNF ;EBNF

8
extra/shell/shell.factor
View File

@ -1,5 +1,6 @@
USING: kernel words continuations namespaces debugger sequences combinators USING: kernel parser words continuations namespaces debugger
sequences combinators prettyprint
system io io.files io.launcher sequences.deep system io io.files io.launcher sequences.deep
accessors multi-methods newfx shell.parser ; accessors multi-methods newfx shell.parser ;
@ -41,6 +42,8 @@ METHOD: expand { glob-expr }
[ ] [ ]
if ; if ;
METHOD: expand { factor-expr } expr>> eval unparse ;
METHOD: expand { object } ; METHOD: expand { object } ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -49,7 +52,8 @@ METHOD: expand { object } ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: run-sword ( basic-expr -- ) command>> unclip "shell" lookup execute ; : run-sword ( basic-expr -- )
command>> expansion unclip "shell" lookup execute ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!