summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-04-17 00:53:14 -0700
committerMichael Forney <mforney@mforney.org>2016-04-17 00:53:14 -0700
commit8303872c044b4133b17b67413168e41a3c870943 (patch)
treece9a51b5e8ff2ad30a2c71fab784a9abe3ce21e2
parent0367f278de5ae628622d954fca1ff1a4780c7483 (diff)
Array style
-rw-r--r--core/cparser/gen.rc2
-rw-r--r--core/file/gen.rc4
-rw-r--r--core/libfirm/gen.rc20
-rw-r--r--core/sbase/gen.rc2
-rw-r--r--ninja.rc19
-rwxr-xr-xsetup.rc10
6 files changed, 29 insertions, 28 deletions
diff --git a/core/cparser/gen.rc b/core/cparser/gen.rc
index b72a0c51..b5d17338 100644
--- a/core/cparser/gen.rc
+++ b/core/cparser/gen.rc
@@ -7,7 +7,7 @@ cflags\
rule revision_hdr 'echo ''#define cparser_REVISION ""'' >$out.tmp && mv $out.tmp $out'
build '$outdir'/revision.h revision_hdr
-srcs=src/^( main.c */*.c )
+srcs=src/^(main.c */*.c)
for(src in $srcs) cc $src '|' '$outdir'/revision.h '||' '$builddir/core/libfirm/stamp'
link cparser $srcs.o '$builddir'/core/libfirm/libfirm.a
file bin/cparser '$outdir'/cparser 755
diff --git a/core/file/gen.rc b/core/file/gen.rc
index b16292d3..0634fcfa 100644
--- a/core/file/gen.rc
+++ b/core/file/gen.rc
@@ -69,11 +69,11 @@ cflags\
# tm_gmtoff
cd magic
-magic_outs=magic/^( Header Localstuff )
+magic_outs=magic/^(Header Localstuff)
for(src in Header Localstuff) build '$outdir'/magic/$src copy '$srcdir'/magic/$src
cd Magdir
srcs=*
-magic_outs=( $magic_outs magic/$srcs )
+magic_outs=($magic_outs magic/$srcs)
for(src in $srcs) build '$outdir'/magic/$src copy '$srcdir'/magic/Magdir/$src
rule magic 'cd $outdir && file -C -m magic'
diff --git a/core/libfirm/gen.rc b/core/libfirm/gen.rc
index 22bb2819..aeb9ff14 100644
--- a/core/libfirm/gen.rc
+++ b/core/libfirm/gen.rc
@@ -18,34 +18,34 @@ cflags\
-I '$srcdir'/ir/tr\
-I '$srcdir'/ir/tv
-backends=( amd64 arm ia32 sparc TEMPLATE )
+backends=(amd64 arm ia32 sparc TEMPLATE)
rule irspec '$python $srcdir/scripts/gen_ir.py $srcdir/scripts/ir_spec.py $in >$out.tmp && mv $out.tmp $out'
rule new_nodes '$perl $srcdir/ir/be/scripts/generate_new_opcodes.pl $in $outdir'
rule regalloc_if '$perl $srcdir/ir/be/scripts/generate_regalloc_if.pl $in $outdir'
rule emitter '$perl $srcdir/ir/be/scripts/generate_emitter.pl $in $outdir'
-genhdrs=( nodes.h gen_irnode.h gen_proj_names.h )
-gensrcs=( gen_irnode.c gen_irio.c )
+genhdrs=(nodes.h gen_irnode.h gen_proj_names.h)
+gensrcs=(gen_irnode.c gen_irio.c)
for(gensrc in $genhdrs $gensrcs) {
build '$outdir'/$gensrc irspec '$srcdir'/scripts/templates/$gensrc
}
-srcs=( ir/*/*.c '$outdir'/$gensrcs )
+srcs=(ir/*/*.c '$outdir'/$gensrcs)
objs=$srcs.o
for(src in $srcs) cc $src '||' '$outdir/stamp'
-stampdeps=( $genhdrs )
+stampdeps=($genhdrs)
for(backend in $backends) {
- types=( emitter regalloc_if new_nodes )
- srcs=( ir/be/$backend/*.c '$outdir'/gen_$backend^_$types.c )
- objs=( $objs $srcs.o )
- stampdeps=( $stampdeps gen_$backend^_$types.h )
+ types=(emitter regalloc_if new_nodes)
+ srcs=(ir/be/$backend/*.c '$outdir'/gen_$backend^_$types.c)
+ objs=($objs $srcs.o)
+ stampdeps=($stampdeps gen_$backend^_$types.h)
{
cflags -I '$srcdir'/ir/be/$backend
for(type in $types) {
- outs=( '$outdir'/gen_$backend^_$type.^(c h) )\
+ outs=('$outdir'/gen_$backend^_$type.^(c h))\
build $"outs $type '$srcdir'/ir/be/$backend/$backend^_spec.pl
}
for(src in $srcs) cc $src '||' '$outdir/stamp'
diff --git a/core/sbase/gen.rc b/core/sbase/gen.rc
index 86bdb775..558c59e0 100644
--- a/core/sbase/gen.rc
+++ b/core/sbase/gen.rc
@@ -106,7 +106,7 @@ executables=(\
yes\
)
-getconf_hdrs=( confstr limits sysconf pathconf )^_l.h
+getconf_hdrs=(confstr limits sysconf pathconf)^_l.h
getconf_outs='$outdir'/$getconf_hdrs
rule getconf_headers 'getconf=$$PWD/$srcdir/getconf.sh && cd $outdir && $$getconf'
build $"getconf_outs getconf_headers '|' '$srcdir/getconf.sh'
diff --git a/ninja.rc b/ninja.rc
index e0382197..c4d34db9 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -10,7 +10,7 @@ fn set {
fn let {
vars=() {
while(! ~ $1 --) {
- vars=( $vars $1' = '$2 )
+ vars=($vars $1' = '$2)
shift 2
}
shift
@@ -67,7 +67,7 @@ fn link {
shift
for(obj in $*) {
if(! ~ $obj '$'*) obj='$outdir'/$obj
- objs=( $objs $obj )
+ objs=($objs $obj)
}
build $out link $objs
}
@@ -78,7 +78,7 @@ fn ar {
shift
for(obj in $*) {
if(! ~ $obj '$'*) obj='$outdir'/$obj
- objs=( $objs $obj )
+ objs=($objs $obj)
}
build $out ar $objs
}
@@ -101,14 +101,14 @@ fn exe {
obj=$src.o
}
if not obj=$src
- objs=( $objs $obj )
+ objs=($objs $obj)
}
link $out $objs
}
}
fn yacc {
- outs='$outdir'/$1.tab.^( c h ) {
+ outs='$outdir'/$1.tab.^(c h) {
let yaccflags '-d -b '$1 -- build $"outs yacc $2
}
}
@@ -119,21 +119,22 @@ fn file {
out='$builddir/$repo.hash'/$1
let args 100$3' '$1 --\
build $out githash $2 '|' '$builddir/$repo.stamp' scripts/hash.rc
- tree_inputs=( $tree_inputs $out )
+ tree_inputs=($tree_inputs $out)
- if(! ~ $3 755 644) tree_perms=( $tree_perms 100$3' '$1 )
+ if(! ~ $3 755 644) tree_perms=($tree_perms 100$3' '$1)
status=()
}
fn dir {
- tree_perms=( $tree_perms '010'$2' '$1 )
+ tree_perms=($tree_perms '010'$2' '$1)
+ status=()
}
fn sym {
out='$builddir/$repo.hash'/$1
let args 120000' '$1' '$2 --\
build $out githash '|' '$builddir/$repo.stamp' scripts/hash.rc
- tree_inputs=( $tree_inputs $out )
+ tree_inputs=($tree_inputs $out)
}
status=()
diff --git a/setup.rc b/setup.rc
index 4053cddd..265cedfd 100755
--- a/setup.rc
+++ b/setup.rc
@@ -20,9 +20,9 @@ if(! ~ $#* 0 1) usage
fn subgen {
subninja '$dir'/$1/local.ninja
- gen_inputs=( $gen_inputs phony/'$dir'/$1/gen )
- tree_inputs=( $tree_inputs '$outdir'/$1/root.tree )
- tree_perms=( $tree_perms '$outdir'/$1/root.perms )
+ gen_inputs=($gen_inputs phony/'$dir'/$1/gen)
+ tree_inputs=($tree_inputs '$outdir'/$1/root.tree)
+ tree_perms=($tree_perms '$outdir'/$1/root.perms)
if(~ $recurse 1 || ! [ -f $1/local.ninja ]) @ gen $1 &
status=()
}
@@ -57,14 +57,14 @@ fn gen {
if(! ~ $#tree_perms 0) {
printf '%s\n' $tree_perms >$absdir/local.perms
- perms_inputs=( $perms_inputs '$dir'/local.perms )
+ perms_inputs=($perms_inputs '$dir'/local.perms)
}
if(~ $#perms_inputs 0) build '$outdir/root.perms' stamp
if not build '$outdir/root.perms' cat $perms_inputs
if(~ $#tree_inputs 0) build '$outdir/root.tree' stamp
if not build '$outdir/root.tree' cat $tree_inputs
} >local.ninja.tmp
- mv $absdir/^( local.ninja.tmp local.ninja )
+ mv $absdir/^(local.ninja.tmp local.ninja)
if(! ~ $quiet 1) echo 'generated '$dir >[1=2]