-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PR for easier review #1
Draft
iho
wants to merge
6
commits into
erpuno:main
Choose a base branch
from
iho:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,9 +14,9 @@ defmodule ASN1 do | |
type1 = bin(type) | ||
case level do | ||
"" -> [] | ||
_ -> print 'array: #{level} : ~ts = [~ts] ~p ~n', [name1, type1, tag] | ||
_ -> print ~c'array: #{level} : ~ts = [~ts] ~p ~n', [name1, type1, tag] | ||
end | ||
# :io.format 'seqof:8: ~p [~ts]~n', [name1, lookup(bin(type1)) ] | ||
:io.format ~c'seqof:8: ~p [~ts]~n', [name1, lookup(bin(type1)) ] | ||
setEnv(name1, "[#{type1}]") | ||
setEnv({:array, name1}, {tag, type1}) | ||
name1 | ||
|
@@ -36,8 +36,8 @@ defmodule ASN1 do | |
def fieldType(_,_,{:"BIT STRING", _}), do: "ASN1BitString" | ||
def fieldType(_,_,{:pt, {_,_,_,type}, _}) when is_atom(type), do: "#{type}" | ||
def fieldType(_,_,{:ANY_DEFINED_BY, type}) when is_atom(type), do: "ASN1Any" | ||
def fieldType(_name,_field,{:Externaltypereference,_,_,type}) when type == :OrganizationalUnitNames do | ||
# :io.format 'seqof:1: ~p.~p ~ts~n', [name, field, type ] #lookup(bin(type)) ] | ||
def fieldType(name,field,{:Externaltypereference,_,_,type}) when type == :OrganizationalUnitNames do | ||
:io.format ~c'seqof:1: ~p.~p ~ts~n', [name, field, type ] #lookup(bin(type)) ] | ||
"#{substituteType(lookup(bin(type)))}" | ||
end | ||
def fieldType(_name,_field,{:Externaltypereference,_,_,type}) do | ||
|
@@ -61,7 +61,7 @@ defmodule ASN1 do | |
def sequenceOf2(name,field,{:type,_,{:SEQUENCE, _, _, _, fields} = product,_,_,_}) do | ||
sequence(fieldType(name,field,product), fields, [], true) ; bin(name) <> "_" <> bin(field) <> "_Sequence" end | ||
def sequenceOf2(name,field,{:type,_,type,_,_,_}) do "#{sequenceOf(name,field,type)}" end | ||
def sequenceOf2(name,_,{:Externaltypereference, _, _, type}) do | ||
def sequenceOf2(name,_,{:Externaltypereference, _, _, type}) do | ||
# :io.format 'seqof:4: ~p.~p~n', [name, type] | ||
:application.get_env(:asn1scg, bin(name), bin(type)) end | ||
def sequenceOf2(_,_,x) when is_tuple(x), do: substituteType("#{bin(:erlang.element(1, x))}") | ||
|
@@ -332,8 +332,8 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
_ -> | ||
:skip | ||
end | ||
print 'field: ~ts.~ts : ~ts ~n', [name,fieldName(fieldName), substituteType(lookup(field))] | ||
pad(w) <> | ||
print ~c'field: ~ts.~ts : ~ts ~n', [name,fieldName(fieldName), substituteType(lookup(field))] | ||
pad(w) <> | ||
emitSequenceElementOptional(fieldName(fieldName), substituteType(lookup(field)), opt(optional)) | ||
_ -> "" | ||
end, fields), "") | ||
|
@@ -484,22 +484,22 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
end | ||
|
||
def dump() do | ||
:lists.foldl(fn {{:array,x},{tag,y}}, _ -> print 'env array: ~ts = [~ts] ~tp ~n', [x,y,tag] | ||
{x,y}, _ when is_binary(x) -> print 'env alias: ~ts = ~ts ~n', [x,y] | ||
{{:type,x},_}, _ -> print 'env type: ~ts = ... ~n', [x] | ||
:lists.foldl(fn {{:array,x},{tag,y}}, _ -> print ~c'env array: ~ts = [~ts] ~tp ~n', [x,y,tag] | ||
{x,y}, _ when is_binary(x) -> print ~c'env alias: ~ts = ~ts ~n', [x,y] | ||
{{:type,x},_}, _ -> print ~c'env type: ~ts = ... ~n', [x] | ||
_, _ -> :ok | ||
end, [], :lists.sort(:application.get_all_env(:asn1scg))) | ||
end | ||
|
||
def compile() do | ||
{:ok, f} = :file.list_dir inputDir() | ||
files = :lists.filter(fn x -> [_,y] = :string.tokens(x, '.') ; y == 'asn1' end, f) | ||
files = :lists.filter(fn x -> [_,y] = :string.tokens(x, ~c'.') ; y == ~c'asn1' end, f) | ||
setEnv(:save, false) ; :lists.map(fn file -> compile(false, inputDir() <> :erlang.list_to_binary(file)) end, files) | ||
setEnv(:save, false) ; :lists.map(fn file -> compile(false, inputDir() <> :erlang.list_to_binary(file)) end, files) | ||
setEnv(:save, true) ; :lists.map(fn file -> compile(true, inputDir() <> :erlang.list_to_binary(file)) end, files) | ||
print 'inputDir: ~ts~n', [inputDir()] | ||
print 'outputDir: ~ts~n', [outputDir()] | ||
print 'coverage: ~tp~n', [coverage()] | ||
print ~c'inputDir: ~ts~n', [inputDir()] | ||
print ~c'outputDir: ~ts~n', [outputDir()] | ||
print ~c'coverage: ~tp~n', [coverage()] | ||
dump() | ||
:ok | ||
end | ||
|
@@ -529,10 +529,24 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
{:type, _, {:"SEQUENCE", _, _, _, fields}, _, _, :no} -> sequence(name, fields, modname, save) | ||
{:type, _, {:"SET", _, _, _, fields}, _, _, :no} -> set(name, fields, modname, save) | ||
{:type, _, {:"SEQUENCE OF", {:type, _, {_, _, _, type}, _, _, _}}, _, _, _} -> | ||
# :io.format 'seqof:7: ~p [~ts]~n', [name, substituteType(lookup(bin(type))) ] | ||
array(name,substituteType(lookup(bin(type))),:sequence,"top") | ||
{:type, [], {:"SEQUENCE OF", {_, _, {_, _, _, _,_type}, _, _, _}}, _, _, _} -> | ||
:io.format ~c'seqof:536: ~p ~n', [name] | ||
{:type, [], {:"SEQUENCE OF", {_, _, {_, _, _, _, _,type}, _, _, _}}, _, _, _} -> | ||
array(name,substituteType(lookup(bin(type))),:sequence,"top") | ||
{:type, [], {:"SEQUENCE OF", {_, _, {_,{_,_, type, _},_} , _, _, _}}, _, _, _} -> | ||
array(name,substituteType(lookup(bin(type))),:sequence,"top") | ||
{:type, [], {:"SEQUENCE OF", {_, _, :"OBJECT IDENTIFIER" , _, _, _}}, _, _, _} -> | ||
:skip | ||
{:type, _, {:"SET OF", {:type, _, {_, _, _, type}, _, _, _}}, _, _, _} -> | ||
array(name,substituteType(lookup(bin(type))),:set,"top") | ||
{:type, [], {:"SET OF", {_, _, {_, _, _, _, type}, _, _, _}}, _, _, _} -> | ||
array(name,substituteType(lookup(bin(type))),:set,"top") | ||
{:type, [], {:"SET OF", {_, _, {_, {_, _, type, _}, _}, _, _, _}}, _, _, _} -> | ||
# array(name,substituteType(lookup(bin(type))),:set,"top") | ||
# :io.format ~c'seqof:548: ~p ~p ~n', [name, type] | ||
array(name,substituteType(lookup(bin(type))),:set,"top") | ||
# exit(1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. це треба, так |
||
{:type, _, {:"BIT STRING",_}, _, [], :no} -> setEnv(name, "BIT STRING") | ||
{:type, _, :'BIT STRING', _, [], :no} -> setEnv(name, "BIT STRING") | ||
{:type, _, :'INTEGER', _set, [], :no} -> setEnv(name, "INTEGER") | ||
|
@@ -548,20 +562,20 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
{:type, _, {:Externaltypereference, _, _, ext}, _set, [], _} -> setEnv(name, ext) | ||
{:type, _, {:pt, _, _}, _, [], _} -> :skip | ||
{:type, _, {:ObjectClassFieldType, _, _, _, _fields}, _, _, :no} -> :skip | ||
{:type, _, {:SEQUENCE, _, _, _, _fields}, _, _, :no} -> :skip | ||
{:Object, _, _val} -> :skip | ||
{:Object, _, _, _} -> :skip | ||
{:ObjectSet, _, _, _, _} -> :skip | ||
_ -> :skip | ||
end | ||
case res do | ||
:skip -> print 'Unhandled type definition ~p: ~p~n', [name, typeDefinition] | ||
:skip -> print ~c'Unhandled type definition ~p: ~p~n', [name, typeDefinition] | ||
_ -> :skip | ||
end | ||
end | ||
|
||
def compileValue(_pos, name, type, value, _mod), do: print 'Unhandled value definition ~p : ~p = ~p ~n', [name, type, value] ; [] | ||
def compileClass(_pos, name, _mod, type), do: print 'Unhandled class definition ~p : ~p~n', [name, type] ; [] | ||
def compilePType(_pos, name, args, type), do: print 'Unhandled PType definition ~p : ~p(~p)~n', [name, type, args] ; [] | ||
def compileValue(_pos, name, type, value, _mod), do: (print ~c'Unhandled value definition ~p : ~p = ~p ~n', [name, type, value] ; []) | ||
def compileClass(_pos, name, _mod, type), do: (print ~c'Unhandled class definition ~p : ~p~n', [name, type] ; []) | ||
def compilePType(_pos, name, args, type), do: (print ~c'Unhandled PType definition ~p : ~p(~p)~n', [name, type, args] ; []) | ||
def compileModule(_pos, _name, _defid, _tagdefault, _exports, _imports), do: [] | ||
|
||
def sequence(name, fields, modname, saveFlag) do | ||
|
@@ -609,7 +623,7 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
fileName = dir <> norm <> ".swift" | ||
:ok = :file.write_file(fileName,res) | ||
verbose = getEnv(:verbose, false) ; setEnv(:verbose, true) | ||
print 'compiled: ~ts.swift~n', [norm] ; setEnv(:verbose, verbose) | ||
print ~c'compiled: ~ts.swift~n', [norm] ; setEnv(:verbose, verbose) | ||
end | ||
|
||
def save(_, _, _, _), do: [] | ||
|
@@ -627,7 +641,7 @@ public struct #{name} : Hashable, Sendable, Comparable { | |
def plicit([{:tag,:CONTEXT,_,{:default,:EXPLICIT},_}]), do: "Explicit" | ||
def plicit([{:tag,:CONTEXT,_,:IMPLICIT,_}]), do: "Implicit" | ||
def plicit([{:tag,:CONTEXT,_,:EXPLICIT,_}]), do: "Explicit" | ||
def plicit(_), do: "" | ||
# def plicit(_), do: "" | ||
|
||
def opt(:OPTIONAL), do: "?" | ||
def opt(_), do: "" | ||
|
@@ -661,7 +675,7 @@ case System.argv() do | |
["compile","-v",i] -> ASN1.setEnv(:input, i <> "/") ; ASN1.setEnv(:verbose, true) ; ASN1.compile | ||
["compile",i,o] -> ASN1.setEnv(:input, i <> "/") ; ASN1.setEnv(:output, o <> "/") ; ASN1.compile | ||
["compile","-v",i,o] -> ASN1.setEnv(:input, i <> "/") ; ASN1.setEnv(:output, o <> "/") ; ASN1.setEnv(:verbose, true) ; ASN1.compile | ||
_ -> :io.format('Copyright © 2023 Namdak Tonpa.~n') | ||
:io.format('ISO 8824 ITU/IETF X.680-690 ERP/1 ASN.1 DER Compiler, version 0.9.1.~n') | ||
:io.format('Usage: ./asn1.ex help | compile [-v] [input [output]]~n') | ||
_ -> :io.format(~c'Copyright © 2023 Namdak Tonpa.~n') | ||
:io.format(~c'ISO 8824 ITU/IETF X.680-690 ERP/1 ASN.1 DER Compiler, version 0.9.1.~n') | ||
:io.format(~c'Usage: ./asn1.ex help | compile [-v] [input [output]]~n') | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
вот тут ніби правильно