Implement stricter parsing #141 : release

makesure

@@ -259,8 +259,8 @@ function checkBeforeRun(i,j,dep,depCnt,goalName){
    addError("Goal " quote2(goalName,1)" uses unknown lib '\''" GoalToLib[goalName] "'\''",UseLibLineNo[goalName])}}
 function getPreludeCode(a,k){
  addLine(a,MyDirScript)
- for(k in Vars){
-  addLine(a,k "=" quoteArg(Vars[k])";export " k)}
+ for(k in Vars)
+  addLine(a,k "=" quoteArg(Vars[k])";export " k)
  return a[0]}
 function doWork(\
  i,goalName,gnLen,gnMaxLen,reachedGoals,emptyGoals,preludeCode,
@@ -470,8 +470,8 @@ function instantiate(goal,args,newArgs,i,j,depArg,depArgType,dep,goalNameInstant
 function instantiateGoalName(goal,args,res,cnt,i){
  if((cnt=GoalParamsCnt[goal])==0)return goal
  res=goal
- for(i=0;i<cnt;i++){
-  res=res "@" args[GoalParams[goal,i]]}
+ for(i=0;i<cnt;i++)
+  res=res "@" args[GoalParams[goal,i]]
  return res}
 function currentTimeMillis(res){
  if(Gawk)
@@ -625,6 +625,10 @@ function reparseCli(res,i,err){
  for(i=NF=0;i in res;i++){
   $(++NF)=res[i]
   Quotes[NF]=res[i,"quote"]}
+ for(i=2;i<=NF;i++)
+  if("\""==Quotes[i]&&!("@define"==$1&&3==i||"@depends_on"==$1&&"@args"==$3&&i>3)){
+   addError("Wrong quoting: " $i)
+   return -1}
  return 0}
 function quote2(s,force){
  if(index(s,"'\''")){

makesure_candidate

@@ -259,8 +259,8 @@ function checkBeforeRun(i,j,dep,depCnt,goalName){
    addError("Goal " quote2(goalName,1)" uses unknown lib '\''" GoalToLib[goalName] "'\''",UseLibLineNo[goalName])}}
 function getPreludeCode(a,k){
  addLine(a,MyDirScript)
- for(k in Vars){
-  addLine(a,k "=" quoteArg(Vars[k])";export " k)}
+ for(k in Vars)
+  addLine(a,k "=" quoteArg(Vars[k])";export " k)
  return a[0]}
 function doWork(\
  i,goalName,gnLen,gnMaxLen,reachedGoals,emptyGoals,preludeCode,
@@ -470,8 +470,8 @@ function instantiate(goal,args,newArgs,i,j,depArg,depArgType,dep,goalNameInstant
 function instantiateGoalName(goal,args,res,cnt,i){
  if((cnt=GoalParamsCnt[goal])==0)return goal
  res=goal
- for(i=0;i<cnt;i++){
-  res=res "@" args[GoalParams[goal,i]]}
+ for(i=0;i<cnt;i++)
+  res=res "@" args[GoalParams[goal,i]]
  return res}
 function currentTimeMillis(res){
  if(Gawk)
@@ -625,6 +625,10 @@ function reparseCli(res,i,err){
  for(i=NF=0;i in res;i++){
   $(++NF)=res[i]
   Quotes[NF]=res[i,"quote"]}
+ for(i=2;i<=NF;i++)
+  if("\""==Quotes[i]&&!("@define"==$1&&3==i||"@depends_on"==$1&&"@args"==$3&&i>3)){
+   addError("Wrong quoting: " $i)
+   return -1}
  return 0}
 function quote2(s,force){
  if(index(s,"'\''")){