ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2025-05-23 16:40:08 -03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

gen: refactoring, renaming vars for readability

Browse Source 
This does not change the logic of the generatro
but only renames/moves some vars for readability

Signed-off-by: Alexander Bezzubov <bzz@apache.org>
This commit is contained in:
Alexander Bezzubov 2019-04-03 15:40:23 +02:00
parent 6526da77b3
commit b2b61c2a8c
No known key found for this signature in database
GPG Key ID: 8039F5787EFCD05D
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/code-generator/generator/samplesfreq.go
View File

@ -7,7 +7,6 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"math" "math"
"os"
"path/filepath" "path/filepath"
"sort" "sort"
"strconv" "strconv"
@ -41,7 +40,7 @@ func Frequencies(fileToParse, samplesDir, outPath, tmplPath, tmplName, commit st
} }
func getFrequencies(samplesDir string) (*samplesFrequencies, error) { func getFrequencies(samplesDir string) (*samplesFrequencies, error) {
entries, err := ioutil.ReadDir(samplesDir) langDirs, err := ioutil.ReadDir(samplesDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -52,13 +51,14 @@ func getFrequencies(samplesDir string) (*samplesFrequencies, error) {
var tokens = make(map[string]map[string]int) var tokens = make(map[string]map[string]int)
var languageTokens = make(map[string]int) var languageTokens = make(map[string]int)
for _, entry := range entries { for _, langDir := range langDirs {
if !entry.IsDir() { if !langDir.IsDir() {
log.Println(err) log.Println(err)
continue continue
} }
samples, err := getSamples(samplesDir, entry) lang := langDir.Name()
samples, err := getSamplesFrom(filepath.Join(samplesDir, lang))
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
@ -73,7 +73,6 @@ func getFrequencies(samplesDir string) (*samplesFrequencies, error) {
continue continue
} }
lang := entry.Name()
languageTotal += len(samples) languageTotal += len(samples)
languages[lang] = len(samples) languages[lang] = len(samples)
tokensTotal += len(samplesTokens) tokensTotal += len(samplesTokens)
@ -93,22 +92,23 @@ func getFrequencies(samplesDir string) (*samplesFrequencies, error) {
}, nil }, nil
} }
func getSamples(samplesDir string, langDir os.FileInfo) ([]string, error) { func getSamplesFrom(samplesLangDir string) ([]string, error) {
const samplesSubDir = "filenames" const samplesLangFilesDir = "filenames"
samples := []string{} var samples []string
path := filepath.Join(samplesDir, langDir.Name()) sampleFiles, err := ioutil.ReadDir(samplesLangDir)
entries, err := ioutil.ReadDir(path)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, entry := range entries { for _, sampleFile := range sampleFiles {
if entry.Mode().IsRegular() { filename := filepath.Join(samplesLangDir, sampleFile.Name())
samples = append(samples, filepath.Join(path, entry.Name())) if sampleFile.Mode().IsRegular() {
samples = append(samples, filename)
continue
} }
if entry.IsDir() && entry.Name() == samplesSubDir { if sampleFile.IsDir() && sampleFile.Name() == samplesLangFilesDir {
subSamples, err := getSubSamples(samplesDir, langDir.Name(), entry) subSamples, err := getSubSamplesFrom(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -121,9 +121,8 @@ func getSamples(samplesDir string, langDir os.FileInfo) ([]string, error) {
return samples, nil return samples, nil
} }
func getSubSamples(samplesDir, langDir string, subLangDir os.FileInfo) ([]string, error) { func getSubSamplesFrom(path string) ([]string, error) {
subSamples := []string{} subSamples := []string{}
path := filepath.Join(samplesDir, langDir, subLangDir.Name())
entries, err := ioutil.ReadDir(path) entries, err := ioutil.ReadDir(path)
if err != nil { if err != nil {
return nil, err return nil, err