Fix the issue 15

#15

src/ArgExtCom.cc

@@ -24,9 +24,9 @@ bool ArgExtCom::parse(void)
 	// a non small captal letter)
 
 	// fullpath command
-	if( ! m_feeder->smallCapsWithNum(&m_prefix)){
+	if( ! m_feeder->fileNameSegment(&m_prefix)){
 		m_feeder->getPos(&m_end_line, &m_end_char);
-		bool res = m_feeder->command(&m_text);
+		bool res = m_feeder->path(&m_text);
 
 		if(res)
 			m_evaled_text = m_text;
@@ -48,7 +48,7 @@ bool ArgExtCom::parse(void)
 		m_prefix = "";
 
 		string tmp;
-		while(m_feeder->smallCapsWithNum(&tmp)){
+		while(m_feeder->fileNameSegment(&tmp)){
 			m_text = m_text + tmp;
  			if(!m_feeder->str("."))
 				break;
@@ -59,7 +59,7 @@ bool ArgExtCom::parse(void)
 	}
 
 	//hereafter, a command name with a prefix
-	if(!m_feeder->command(&m_text)){
+	if(!m_feeder->path(&m_text)){
 		m_error_msg = "Invalid command name";
 		m_exit_status = 2;
 		m_feeder->getPos(&m_end_line, &m_end_char);

src/DefProc.cc

@@ -30,7 +30,7 @@ bool DefProc::parse(void)
 		return false;
 	}
 
-	if(!m_feeder->command(&m_name)){
+	if(!m_feeder->path(&m_name)){
 		m_feeder->setPos(m_start_line, m_start_char);
 		return false;
 	}

src/Feeder.cc

@@ -41,7 +41,7 @@ void Feeder::close(void)
 	m_ifs = NULL;
 }
 
-bool Feeder::command(string *ans)
+bool Feeder::path(string *ans)
 {
 	if(outOfRange())
 		return false;
@@ -66,6 +66,7 @@ bool Feeder::command(string *ans)
 	return true;
 }
 
+/*
 bool Feeder::smallCaps(string *ans)
 {
 	if(outOfRange())
@@ -87,39 +88,29 @@ bool Feeder::smallCaps(string *ans)
 	checkEol(p);
 	return true;
 }
+*/
 
-bool Feeder::smallCapsWithNum(string *ans)
+bool Feeder::fileNameSegment(string *ans)
 {
 	if(outOfRange())
 		return false;
 
 	string *p = &m_lines[m_cur_line];
-
 	int i = m_cur_char;
-	//bool first = true;
-	bool only_num = true;
 	for(;i < (int)p->length();i++){
-		/*
-		if(first){
-			if( p->at(i) >= 'a' && p->at(i) <= 'z'){
-				first = false;
-				continue;
-			}
-			break;
-		}else{
-		*/
-			if( p->at(i) >= 'a' && p->at(i) <= 'z'){
-				only_num = false;
-				continue;
-			}if( p->at(i) >= '0' && p->at(i) <= '9'){
-				continue;
-			}
-
-			break;
-		//}
+		if( p->at(i) >= '@' && p->at(i) <= 'Z')
+			continue;
+		if( p->at(i) == '_' || p->at(i) == '-')
+			continue;
+		if( p->at(i) >= 'a' && p->at(i) <= 'z')
+			continue;
+		if( p->at(i) >= '0' && p->at(i) <= '9')
+			continue;
+
+		break;
 	}
 
-	if(i == m_cur_char || only_num)
+	if(i == m_cur_char)
 		return false;
 
 	*ans = string(p->c_str()+m_cur_char,i-m_cur_char);
@@ -168,6 +159,7 @@ bool Feeder::blank(void)
 	return true;
 }
 
+/*
 bool Feeder::path(string *ans)
 {
 	if(command(ans)){
@@ -176,6 +168,7 @@ bool Feeder::path(string *ans)
 	}
 	return false;
 }
+*/
 
 bool Feeder::arrayElem(string *name,long *pos)
 {

src/Feeder.h

@@ -44,12 +44,12 @@ class Feeder
 	bool arrayElem(string *name,long *pos);
 	bool comment(void);
 	//bool declare(string *ans, string reserved);
-	bool command(string *ans);
+	//bool command(string *ans);
 	bool blank(void);
 	bool blankLine(void);
 	bool path(string *ans);
-	bool smallCaps(string *ans);
-	bool smallCapsWithNum(string *ans);
+	//bool smallCaps(string *ans);
+	bool fileNameSegment(string *ans);
 	bool positiveInt(long *pos);
 	bool lineResidual(string *ans);
 	bool doBlock(string *ans);

src/Import.cc

@@ -63,7 +63,7 @@ bool Import::parsePATH(void)
 bool Import::parseAs(void)
 {
 
-	if(! m_feeder->smallCaps(&m_prefix)){
+	if(! m_feeder->fileNameSegment(&m_prefix)){
 		m_feeder->setPos(m_start_line, m_start_char);
 		return false;
 	}

src/main.cc

@@ -100,7 +100,7 @@ int scriptPos(int argc, char const* argv[])
 
 void version(void)
 {
-	cerr << "GlueLang v0.2.3 🌸\n\n"
+	cerr << "GlueLang v0.2.4 🌸🌸\n\n"
 	     << "Copyright (C) 2021 Ryuichi Ueda\n"
 	     << "Released under the MIT License.\n"
 	     << "https://github.com/ryuichiueda/GlueLang" << endl;